From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Tue, 02 Nov 2010 09:02:37 GMT
Subject: Re: git stash and manually edited chunks
Message-ID: <vpqd3qoxfma.fsf@bauges.imag.fr>
In-Reply-To: <AANLkTiknhRGuBMFEKbVdyN83SiF9j2nNz=v-nMaD-iTb@mail.gmail.com>

Olivier Verdier <zelbier@gmail.com> writes:

> Thank you,
>
> but that does not explain why there is a conflict *only* when I edit
> the chunk manually, does it?

It does.

If you did not edit the hunk manually, each hunk will be either in
state HEAD or in state A, and applying the diff between HEAD and A to
such file will be either a no-op (hunk already applied), or a
successfull application.

> Besides, some people tried to reproduce my problem on Linux and they
> got no conflict after edited chunks.

I did, on Linux. I get the same behavior as you.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/