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

Christian Weisgerber:

> 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

The problem is here, after the aborted rebase.  Despite "got status"
and "got diff" showing nothing, the worktree is in reality full of
changes.

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