Re: Request for adding a "clean" merge strategy for a double-commit merge to deal with conflicts separately

From: Michal Suchánek <msuchanek@suse.de>
Date: Jul 16, 2020, 17:25 UTC
Message-ID: <20200716172549.GJ32107@kitsune.suse.cz>
In-Reply-To: <CAD9n_qh0y84HC6sX1OxXWWv8dDMMA_tPv9zRknePVivQq_rfww@mail.gmail.com>

On Thu, Jul 16, 2020 at 09:45:24PM +0430, Alireza wrote:

Show 5 quoted lines

> Hi,
> 
> Even though the merge commit's message includes conflicted files by
> default, the *resolution* itself is lost, that is, it's hard or
> impossible to review how the author *resolved* said conflicts.

No, the merge commit includes the resolution. You can compare with all parents, and even perform the same merge locally using your strategy and tooling of choice and compare the result with what the merge author committed as resolution.

> 
> The proposal is that an option like `-X clean` would commit a clean
> merge and leave out any conflicting hunks in the tree for a follow-up
> commit to resolve conflicts.

I don't see any value above performing the same merge locally and comparing with the committed resolution. Can you please elaborate on the expected format of the merge that does add some value?

Thanks

Michal