From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Mon, 09 Aug 2010 21:24:25 GMT
Subject: Re: [PATCH] Avoid rename/add conflict when contents are identical
Message-ID: <AANLkTi=tnWy3w1Ek+uvS+QCr4F+An4FfZcHepiTCFGAf@mail.gmail.com>
In-Reply-To: <5C4EA6C5B30E6B45A9164CB3A26A0D326F79D9AA04@azsmsx503.amr.corp.intel.com>

On Mon, Aug 9, 2010 at 21:00, Schalk, Ken <ken.schalk@intel.com> wrote:

> Here's a simple sequence that generates this kind of conflict:
>
>  git init
>  echo content > fileA
>  git add fileA
>  git commit -m Initial
>  git checkout -b abranch
>  mv fileA fileB
>  git add fileB
>  rm fileA
>  ln -s fileB fileA
>  git add fileA
>  git commit -m Linked
>  git checkout master
>  git mv fileA fileB
>  git add fileB
>  git commit -m Moved
>  git merge --no-commit abranch

I don't know merge well enough to review the code in this patch, but
the patch would be much better if you turned this sequence of commands
(slightly altered, see t/README) into a now-passing test as part of
the patch.

t/t3030-merge-recursive.sh would be the right place to add it.