Re: [PATCH] Avoid rename/add conflict when contents are identical

On Mon, Aug 9, 2010 at 21:00, Schalk, Ken [off-list ref] 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.