Now I'm in a merging state. I want to discard all changes, to back to the state that before the merging, and when I do the merge again, it says "Already up-to-date". Is there a nice way to do it?
My attempt:
git reset --hard head
but when I do the merge again, still conflict.
what I have to do is manually revert all changes by hand and do a empty commit, very tedious.