From: Ulrich Windl <ulrich.windl@rz.uni-regensburg.de>
Date: Wed, 17 Jul 2019 07:58:05 GMT
Subject: Merge: "git rm bla": "bla: needs merge", but still removes file "bla"
Message-ID: <5D2ED50D020000A100032435@gwsmtp.uni-regensburg.de>

Hi!

I just had "an interesting case" for a merge with conflicts:
The merge re-introduced a file that had been renamed (say old one is "bla", and the new one is "foo").
After merging the changes from bla into foo, I added foo, trying to remove bla:
> git add foo
> git rm bla
bla: needs merge
rm 'bla'

The interesting part is that the file was still removed, while claiming "needs merge" before:
> git rm bla
fatal: pathspec 'bla' did not match any files

(git-2.12.3-27.14.1.x86_64 from SLES12 SP4)

Regards,
Ulrich