🌈 搜索
📅  最后修改于: 2022-03-11 14:51:45.164000             🧑  作者: Mango
$ git stash pop # ...resolve conflict(s) $ git reset $ git stash drop