From: Christian Weisgerber <naddy@mips.inka.de>
Subject: Re: rebase suffers '?' conflicts
To: gameoftrees@openbsd.org
Date: Sat, 1 Apr 2023 00:08:23 +0200

Stefan Sperling:

> It would be nice to have repro instructions because off the top
> of my head I have no idea.

It looks as if "rebase -a" doesn't fully restore the state from
before the rebase attempt.  Here's a reproducer script:

git clone --bare https://github.com/openbsd/src.git
cd src.git
git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
git remote add jca https://github.com/jcourreges/openbsd-src.git
git fetch --all
cd ..
got co src.git
cd src
got br tmp
got br -c jca/llvm15-12 llvm15
got up -b tmp
got rb llvm15
got rb -a
got up          # what's happening here?
got bo 049dee6038423fab611bd86b1db50dc65d8c4326
got ci -m 'revert: allow out-of-class defaulting of comparison operators'
got up
got rb llvm15

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de