xgqfrms / git

git all in one

https://git.xgqfrms.xyz

MIT License

2 stars 1 forks source link

git 取消merge #15

Open xgqfrms opened 4 years ago

xgqfrms commented 4 years ago

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

# 取消 merge
$ git merge --abort

# 重置
$ git reset --hard

xgqfrms commented 4 years ago

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/

xgqfrms commented 4 years ago

https://www.git-scm.com/docs/git-merge/1.7.4

xgqfrms commented 4 years ago

git-abort

https://stackoverflow.com/questions/101752/i-ran-into-a-merge-conflict-how-can-i-abort-the-merge