Re: Aborting 'rebase main feat' removes unversioned files

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux