On Nov 19, 2007 4:18 PM, Martin Langhoff <martin.langhoff@xxxxxxxxx> wrote:
> Happens with recursive and resolve. Happy to provide a minimal repro
> case, but I think this is fairly obvious...
Steps to repro...
mkdir repro
cd repro/
cp /etc/resolv.conf ./resolv.conf
git init
git add resolv.conf
git commit -m 'a' resolv.conf
cp resolv.conf resolv-1.conf
git add resolv-1.conf
git commit -m 'a1' resolv-1.conf
echo blabla >> resolv-1.conf
git commit -m 'a2' resolv-1.conf
git-branch other HEAD^^
git checkout other
cp resolv.conf resolv-1.conf
git add resolv-1.conf
git commit -m 'b'
git checkout master
git merge other
...
Auto-merged resolv-1.conf
CONFLICT (add/add): Merge conflict in resolv-1.conf
Automatic merge failed; fix conflicts and then commit the result.
m
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
