Git - Restart conflict resolution in a single file

Questions

In a larger git merge with several conflicting files, I incorrectly marked a file as resolved (using git add FILE after some editing)

Now I d like to undo my conflict resolution attempt and start over resolving that file.

How can I do that?

Answers

http://gitster.livejournal.com/43665.html http://gitster.livejournal.com/43665.html

git checkout -m FILE

This restores the unresolved state, including all information about parent and merge base, which allows restarting the resolution.

Source

License : cc by-sa 3.0

http://stackoverflow.com/questions/14409420/restart-conflict-resolution-in-a-single-file

Related