On Tue, Jun 30, 2026 at 04:29:00PM +0100, Phillip Wood wrote:

Rather than using an integer where -1 is an error, 0 is success and
1 means there were conflicts use an enum. This is clearer and lets
us add a separate return value for commits that are dropped because
they become empty in the next commit.

have you attempted widening the scope of the enum? the three conversions 
between the new enum and existing int return values irk me.