2 messages, 2 authors, 2016-06-15 · open the first message on its own page
From: Bruce Stephens <hidden>
Date: 2016-06-15 22:45:38
The following works fine with 1.6.0.2 and before, but not 1.6.0.3 or
later:
git clone -n git git-test
cd git-test
git checkout -b work v1.6.0.2
When it breaks, the error is:
error: Entry '.gitignore' would be overwritten by merge. Cannot merge.
I'm guessing it's a bug rather than a deliberate change?
From: Michael J Gruber <hidden>
Date: 2016-06-15 22:45:38
Bruce Stephens venit, vidit, dixit 12.11.2008 15:36:
The following works fine with 1.6.0.2 and before, but not 1.6.0.3 or
later:
git clone -n git git-test
cd git-test
git checkout -b work v1.6.0.2
When it breaks, the error is:
error: Entry '.gitignore' would be overwritten by merge. Cannot merge.
I'm guessing it's a bug rather than a deliberate change?
Bisecting gives:
5521883490e85f4d973141972cf16f89a79f1979 is first bad commit
commit 5521883490e85f4d973141972cf16f89a79f1979
Author: Junio C Hamano [off-list ref]
Date: Sun Sep 7 19:49:25 2008 -0700
checkout: do not lose staged removal
CCing Junio...
Michael