Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> writes: >From what I'm understanding now, I should do, when a conflict is > detected: > > nano <files> > git-update-index <files> > git commit > > Previously (at git 1.1.4), I was doing: > nano <files> > git commit <files> > > git 1.2.4 don't allow this bad commit syntax anymore. It is not a bad syntax, and it instead would say "you might have meant to say -i paths...", and if you follow that suggestion to say: $ git commit -i this-and-that-file-I-resolved-by-hand you would commit the cleanly auto-resolved paths _and_ the result of your hand merge result. That is the same traditional behaviour you are used to and is very convenient if you only had a few paths to be hand resolved. So I suspect there might be something else going on. - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html