Michael Witten <mfwitten@xxxxxxxxx> writes: > On Wed, Mar 17, 2010 at 13:37, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> such local changes may conflict with the change >> made between A and B, and stops the command. > > I'm sensing that it needs to be clarified what a conflict is. Hmm, a conflict is "you changed it in one way, and I am trying to change the same thing in another way, you two have to fight it out". What other interpretations are there, especially in a context of SCM? I wouldn't mind a patch to add the definition to glossary, though. -- To unsubscribe from this list: 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