how to I revert my solutions to resolve the conflicts?

Question

I have made a few changes, then pulled from git.

I have had merge conflicts after pulling from git.

I have resolved these conflicts, but my app doesn't work as expected.

How can I revert my solutions (undo) conflict resolution?

I'm using 'egit', and 'source tree'

btw, what is a recommended conflict resolver tool?

Answer 1

git reset --hard HEAD~1 will put your code and git repo both back to where they were before the last commit, which is probably the merge commit. Then you can try merging again.

If you don't care about the changes you had, you can always nuke everything local and start with a fresh git clone .

Answer 2

您可以使用git merge --abort中止整个合并过程，并将存储库恢复为合并前的状态。