Thread (13 messages) 13 messages, 5 authors, 2021-09-08

Re: Aborting 'rebase main feat' removes unversioned files

flat view

From: Jeff King <hidden>
Date: 2021-09-04 10:25:00

On Sat, Sep 04, 2021 at 12:03:49PM +0200, Fedor Biryukov wrote:
Here's the output from Windows, where everything works as expected.
[...]
PS> git rebase main feat
error: The following untracked working tree files would be overwritten
by checkout:
        readme.txt
Please move or remove them before you switch branches.
Aborting
error: could not detach HEAD
Interesting that it behaves differently than the mac and linux versions.
There are some changes between Git for Windows and regular upstream Git,
but looking over the diff between the v2.33.0 releases, I don't see
anything that might cause this discrepancy.

If the problem used to occur on v2.31 and now doesn't, it might be
interesting to bisect it.

-Peff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help