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

Elijah Newren [off-list ref] writes:

I disagree that they are "lost".  Rather, git doesn't make them very
easy to access: git log -p won't show you any output for a merge by
default, and the only options that exist (-c, -cc) don't do what you
need to see how conflicts were resolved.

With "sometimes" sprinkled into appropriate places, you are 110%
right.