From: Christian Weisgerber <naddy@mips.inka.de>
Subject: Remote has rebased, now what?
To: gameoftrees@openbsd.org
Date: Wed, 1 Mar 2023 16:54:25 +0100

Thomas Adam:

> Please have a look at the `ta/configh` branch in the main -portable repo,

This leads me to a usage question:

Thomas has just rebased the ta/configh branch after he had already
published it.  Oh-oh.  Now, after the latest "got fetch" I have a
origin/ta/configh branch and a divergent ta/configh branch that I
can no longer cleanly rebase on origin.  Conflicts!  What's the
recommended way to get them back in sync?

(I ended up using histedit -d to cut off enough of the tip of
ta/configh that I could rebase>forward it again on origin/ta/configh.)

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