git merge 撤销与git 回滚

git merge提交后恢复

http://blog.psjay.com/posts/git-revert-merge-commit/

git回滚

https://www.jianshu.com/p/f7451177476a

git revert 如果有冲突，需要解决冲突，再进行

git add .

git commit