How to cancel a merge

2018-06-14 16:03:26

This question already has an answer here:

I ran into a merge conflict. How can I abort the merge? 10 answers

From this Atlassian doc resource:

Hit 'Revert' on the toolbar, but then click on the 'Reset All' tab and use that. This will reset the merge metadata too.

By the way, you might handle this from the Git command line using:

git reset --hard HEAD

由于您有未提交的代码，因此您可以恢复到您的HEAD

> git reset --hard HEAD

You are in the merge process. If you need to abort the merge, You need to get out of the merge by using git merge --abort .

If not do a git status git status to figure out what the conflicts and changes are and then commit those changes to continue with the merge.

链接地址: http://www.djcxy.com/p/41712.html