From: Stefan Sperling <stsp@stsp.name>
Subject: Re: rebase suffers '?' conflicts
To: Christian Weisgerber <naddy@mips.inka.de>
Cc: gameoftrees@openbsd.org
Date: Fri, 31 Mar 2023 21:53:43 +0200

On Fri, Mar 31, 2023 at 07:15:23PM +0200, Christian Weisgerber wrote:
> Instead of extracting and applying a patch, I'm trying to rebase
> jca@'s llvm15 branch on OpenBSD master.  It's not going well.
> 
> The worktree I'm starting from is pristine, there are no unversioned
> files lying around.  And yet, rebase reports '?' conflicts, "changes
> destined for an unversioned file were not merged".  2151 of them,
> in fact.
> 
> The llvm15-12 branch in jca@'s repository at
> https://github.com/jcourreges/openbsd-src
> has seven commits on top of old master.
> 
> The first one, "llvm: revert to 13.0.0", is rebased fine.
> The second one, "llvm: update to 15.0.7" blows up.
> 
> This is more a general question about what the heck is happening
> there, but if somebody wants to reproduce it, I can try to provide
> instructions.

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