I have 10 files which have conflicts when merging branches. I've resolved all conflicts of the 10 files(took long time). Unfortunately before the commit, I find out that one file has been merged wrong and need start again for this file. :(
in the Git, How to mark the file which has been merged unmerged, in other word, how to re-merge that one file?