From: Michael Witten <mfwitten@gmail.com>
Date: Wed, 17 Mar 2010 18:50:15 GMT
Subject: Re: [PATCH] Clarification for the command "git checkout <branch>"
Message-ID: <b4087cc51003171150g303cf1c0uf2e0227594eef3fc@mail.gmail.com>
In-Reply-To: <7v8w9qkd5z.fsf@alter.siamese.dyndns.org>

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.