git-取消merge

步骤一

查看更新历史，获取需要回到的更新版本号。命令git reflog

$ git reflog
3cf4ebf0 HEAD@{0}: reset: moving to HEAD
3cf4ebf0 HEAD@{1}: reset: moving to HEAD
3cf4ebf0 HEAD@{2}: merge origin/dev: Merge made by the 'recursive' strategy.
a2161a58 HEAD@{3}: reset: moving to HEAD
a2161a58 HEAD@{4}: commit: 增加审核结果钉钉消息2
231d9dd9 HEAD@{5}: commit: 增加审核结果钉钉消息1
4039c99c HEAD@{6}: merge origin/master-1111: Merge made by the 'recursive' strategy.

前面的就是更新版本号。

步骤二

回退到固定的更新版本号（即你merge之前的更新处）。命令 git reset --hard a2161a58

$ git reset --hard a21461a58
HEAD is now at a21461a58 增加审核结果钉钉消息2

ok~