From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Mar 2010 19:23:21 GMT
Subject: Re: [PATCH] Clarification for the command "git checkout <branch>"
Message-ID: <7vfx3yiwgm.fsf@alter.siamese.dyndns.org>
In-Reply-To: <b4087cc51003171150g303cf1c0uf2e0227594eef3fc@mail.gmail.com>

Michael Witten <mfwitten@gmail.com> writes:

> On Wed, Mar 17, 2010 at 13:37, Junio C Hamano <gitster@pobox.com> 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.