Re: Aborting 'rebase main feat' removes unversioned files

From: Jeff King <peff@peff.net>
Date: Sep 4, 2021, 10:24 UTC
Message-ID: <YTNJeY2U6tcOQiCh@coredump.intra.peff.net>
In-Reply-To: <CAG2t84Ud9AFfHhCxyKWvcqVUKTrkRufdMsQL93cdUUvVAyNpzA@mail.gmail.com>

On Sat, Sep 04, 2021 at 12:03:49PM +0200, Fedor Biryukov wrote:

Show 9 quoted lines

> 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