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

From:
Stefan Sperling <stsp@stsp.name>
Subject:
Re: [patch] Refuse to start a new merge if one's in progress.
To:
James Cook <falsifian@falsifian.org>
Cc:
gameoftrees@openbsd.org
Date:
Thu, 1 Jun 2023 09:34:49 +0200

Download raw body.

Thread 
On Thu, Jun 01, 2023 at 01:56:24AM +0000, James Cook wrote:
> This patch makes "got merge" refuse to run if a merge is in progress and
> the -a or -c option wasn't passed.
> 
> Normally, before this patch, it would fail anyway and say "work tree
> contains local changes". (This patch changes the error to "a merge
> operation is in progress", which I think is more helpful.)

Makes sense. I have committed this, thanks!