From: Stefan Sperling <stsp@stsp.name>
Subject: Re: make 'got update' skip conflicted files?
To: "Todd C. Miller" <Todd.Miller@sudo.ws>
Cc: gameoftrees@openbsd.org
Date: Sat, 18 Apr 2020 20:39:20 +0200

On Sat, Apr 18, 2020 at 10:04:24AM -0600, Todd C. Miller wrote:
> Looks good to me.  I guess no callers check for rebase_status ==
> GOT_STATUS_MERGE.

Right. rebase_status == CONFLICT is essentially just a flag which aborts
the rebase loop in case a conflict occurs while rebasing a commit.

Thanks for the review!