From: Omar Polo <op@omarpolo.com>
Subject: Re: [patch] Fixes to GOT_ERR_MERGE_COMMIT_OUT_OF_DATE
To: James Cook <falsifian@falsifian.org>
Cc: gameoftrees@openbsd.org
Date: Sun, 04 Jun 2023 18:16:12 +0200

forgot to attach a patch? :-)

On 2023/06/04 15:29:09 +0000, James Cook <falsifian@falsifian.org> wrote:
> [...]
> - I changed the value of GOT_ERR_MERGE_COMMIT_OUT_OF_DATE; will that
>   break anything? E.g. does it ever get serialized?

It's fine to add/change/remove error messages.  Whilist got sends them
via IPC (imsg), you're not supposed to use a libexec from a previous
version with a 'newer' got(1) version.

So that seems fine, since GOT_ERR_MERGE_STAGED_PATHS and
GOT_ERR_MERGE_COMMIT_OUT_OF_DATE have the same number but different
error strings.