Re: [PATCH v2 0/3] merge-ll: Cleanup merge driver temporaries after
- From
Jeff King <peff@peff.net>
- Date
- Sep 14, 2026, 16:59 UTC
- Message-ID
- <20260914165903.GD32247@peff.net>
- In-Reply-To
- <aqf0fw2igdjsXe-V@localhost.localdomain>
On Mon, Sep 14, 2026 at 03:23:28PM +0200, Michal Koutný wrote:
Show 12 quoted lines
> > Hmm. I wonder if leaving the files could actually be a _feature_. If you > > completed the merge with the external tool but we barfed reading it back > > in, would it be useful to leave the file in place? It's possible, I > > suppose, but I think it is more likely to be a nuisance (and we already > > delete it for things like read() errors, just not anything that would > > cause us to die()). > > From the user perspective, this is unnecessary. (Potentially useful for > debugging the merge tool.) > For the former, the whole merge can retried (after restoring state), the > latter is quite rare and can be worked around easily when the merge tool is > under development.
I was more wondering if a user would be frustrated that they spent 30 minutes doing a really complicated merge in the tool, and then that output was lost. I'd guess it's pretty rare, though.
-Peff