On 29/10/2023 06:24, Elijah Newren wrote:

On Tue, Oct 24, 2023 at 12:58 PM brian m. carlson

quoted

This is in use at
GitHub to produce conflict diffs when a merge fails, and it seems
generally useful, so I'm sending it here.

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?

I was surprised by this as well, but as you say this seems like a 
useful addition independent of any specific use at GitHub.

Best Wishes

Phillip