When working in teams that use branches in git, eventually you're going to get a merge conflict. Most of the time this isn't to much of a problem you just work through the conflicts and commit the changes. From time to time I mess up the merge and I want to just restart resolving the merge conflict again. Thankfully git make it easy if you haven't committed the changes. Just run the command git checkout -m <file name> That's it, you can now try and do the merge again as if you haven't resolved the latest conflict.
A Blog about my side projects and the things I've learned.