From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Mon, 30 Oct 2023 16:24:24 GMT
Subject: Re: [PATCH 0/1] Object ID support for git merge-file
Message-ID: <ZT_YuF4g-8P9fc4t@tapette.crustytoothpaste.net>
In-Reply-To: <ZT/RpqvfQyx+uzxa@nand.local>

On 2023-10-30 at 15:54:14, Taylor Blau wrote:
> On Sat, Oct 28, 2023 at 11:24:06PM -0700, Elijah Newren wrote:
> > But...wouldn't you already have the conflicts generated when doing the
> > merge and learning that it fails?  Why would you need to generate them
> > again?
> 
> brian would know better than I do, but I believe the reason is because
> the "attempt this merge" RPC is handled separately from the "show me the
> merge conflict(s) at xyz path". Those probably could be combined
> (obviating the need for this patch), but doing so is probably rather
> complicated.

That's correct.  They could in theory happen at different times, which
is why they're not linked.
-- 
brian m. carlson (he/him or they/them)
Toronto, Ontario, CA