From: Christian Weisgerber Subject: Interactions between worktrees To: gameoftrees@openbsd.org Date: Thu, 7 Apr 2022 21:57:29 +0200 Using different work trees that are checked out from the same repository can lead to various interactions, because many operations affect the repository state and thus indirectly the other worktree. This one is interesting: $ got up -b const got: a rebase operation is in progress in this work tree and must be continued or aborted first $ got rb -a got: reference refs/got/worktree/rebase/commit-e001ae79-bf70-4253-bac2-bdced68c8189 not found How did I get there? $ got rb const got: cannot rebase branch which contains changes outside of this work tree's path prefix So I ran the rebase operation in a second work tree that contained the path in question. But now my first work tree is stuck in limbo, see above. I can't abort or continue the rebase, and I can't switch to a different branch. I guess that's a case of "don't do that then", but, hmm, the result is a bit unfortunate. Is there a way to recover? -- Christian "naddy" Weisgerber naddy@mips.inka.de