"GOT", but the "O" is a cute, smiling pufferfish. Index | Thread | Search

From:
Stefan Sperling <stsp@stsp.name>
Subject:
Re: rebase suffers '?' conflicts
To:
Mark Jamsek <mark@jamsek.com>
Cc:
Christian Weisgerber <naddy@mips.inka.de>, gameoftrees@openbsd.org
Date:
Wed, 12 Apr 2023 17:09:07 +0200

Download raw body.

Thread
On Thu, Apr 13, 2023 at 12:21:29AM +1000, Mark Jamsek wrote:
> Nice! Thanks for the explanation, it all makes sense and is good to
> know. I thought this was going to be a lot more work to fix.

My fix is not quite correct. The contents of the file 'beta' are
still from newbranch at the end of the test.
I need to take another look at this.