Re: Distinguishing trivial and non-trivial merge commits

From: Junio C Hamano <gitster@pobox.com>
Date: May 2, 2010, 23:07 UTC
Message-ID: <7vwrvlucls.fsf@alter.siamese.dyndns.org>
In-Reply-To: <19421.59529.849850.968565@winooski.ccs.neu.edu>

Eli Barzilay <eli@barzilay.org> writes:

Show 5 quoted lines

> Good -- the first paragraph is what I thought it would do, the second
> makes it even better.  Perhaps it would be nice to show such manual
> reoslutions from one parent, but I think that that certainly qualifies
> as stuff that is much less interesting than work that was done to
> combine content inside a file, or one of those evil merges.

You need to be careful here.

If you see a conflicted hunk and the result ends up being the same from one of the parents in that area, then the _result_ is trivial as far as the merge (and hence --cc) is concerned, even though you may have spent considerable braincycle to stare at the conflict to decide that taking a change from one side is the right thing to do.

You keep saying "manual resolutions", but --cc doesn't have much to do with the resolution being manual, nor if the initial mechanical merge attempt left conflict markers. You would need to redo the merge to find that out, and it can be fairly cheaply done with a temporary index and an empty temporary working tree elsewhere in the filesystem.