Re: git rebase issue

[Jeff King <peff@peff.net>]

[Please don't put random folks in the to/cc unless you think they have
specific knowledge related to your problem.]

On Mon, Mar 20, 2023 at 02:10:38PM +0200, Andy Shevchenko wrote:

> > > With the new release I have got an error
> > >
> > >   fatal: 'netboot' is already checked out at ...
> > >
> > > To work around this I have to split the above to
> > >
> > >   git checkout --ignore-other-worktrees "$branch"
> > >   git rebase --rebase-merges -X ours --onto "$newbase" "$oldbase"
> > >
> > > which makes all these too inconvenient.
> > >
> > > Any suggestions?
> 
> So, what should I do? Today I got again to help manually with my (used
> to working) scripts.

Running "git log --grep=already.checked.out" suggests that it may be
b5cabb4a967 (rebase: refuse to switch to branch already checked out
elsewhere, 2020-02-23).

Adding its author to the cc, who may be able to say more. But my
understanding is that this was probably fixing a bug (though I don't
know all the implications of having a branch checked out in multiple
worktrees).

-Peff