On Tue, Oct 24, 2023 at 12:58 PM brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> wrote: > > This series introduces an --object-id option to git merge-file such > that, instead of reading and writing from files on the system, it reads > from and writes to the object store using blobs. This seems like a reasonable capability to want from such a plumbing command. > 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? (Also, generating them again may risk getting names munged for conflict markers in edge cases involving renames.) That said, even if I have questions about your particular usecase, I think the feature you are submitting here makes sense independently. I left a few minor questions on the patch itself, but overall it looks good to me.
