From: Thomas Adam <thomas@xteddy.org>
Subject: Re: add a 'got merge' command
To: gameoftrees@openbsd.org
Date: Fri, 24 Sep 2021 17:56:45 +0100

Hello,

On Fri, Sep 24, 2021 at 06:35:57PM +0200, Stefan Sperling wrote:
> Adding a merge command is an item in our TODO file, and it was now also
> requested by a -portable user on IRC. This patch provides an initial
> implementation to accommodate workflows which mandate merge commits.
> 
> This does not yet implement the "sub directory" merge idea mentioned
> in the TODO file. That requires more work and would also apply to
> other commands which merge changes, such as cherrypick and backout.
> 
> Test coverage could be improved but I wanted to share what I already have.
> 
> ok?

I've given this a quick test in -portable.  Seems to work well for me.

I haven't reviewed the code in detail -- happy to do that, but likely will
happen after this lands on branch main.  I don't see any blocks to merging
this from what I've done with it so far.

Kindly,
Thomas