Open xgqfrms opened 4 years ago
https://segmentfault.com/q/1010000000140446
https://git-scm.com/docs/git-merge
https://git-scm.com/docs/git-revert
https://www.git-tower.com/learn/git/ebook/cn/command-line/advanced-topics/merge-conflicts
# 取消 merge $ git merge --abort # 重置 $ git reset --hard
https://stackoverflow.com/questions/101752/i-ran-into-a-merge-conflict-how-can-i-abort-the-merge
https://nathanhoad.net/how-to-git-cancel-merge/
https://www.git-scm.com/docs/git-merge/1.7.4
git 取消merge
https://segmentfault.com/q/1010000000140446
https://git-scm.com/docs/git-merge
https://git-scm.com/docs/git-revert
git merge & git reset
https://www.git-tower.com/learn/git/ebook/cn/command-line/advanced-topics/merge-conflicts