On Tue, Oct 25, 2016 at 6:06 PM, Duy Nguyen <[email protected]> wrote: > On Tue, Oct 25, 2016 at 6:10 AM, Junio C Hamano <[email protected]> wrote: >> The procedure to resolve a merge conflict typically goes like this: >> >> - first open the file in the editor, and with the help of conflict >> markers come up with a resolution. >> >> - save the file. >> >> - look at the output from "git diff" to see the combined diff to >> double check if the resolution makes sense. >> >> - perform other tests, like trying to build the result with "make". >> >> - finally "git add file" to mark that you are done.
BTW making git-add (and "git commit -a") refuse files with conflict markers present could prevent this mistake earlier and is probably a better option because the user won't have to discover 'reset --unmerge'. If the user likes to add the file with conflict markers anyway (because those look like conflict markers but are in fact not) then they can go with "git add -f" or similar. -- Duy
