On 2/21/2012 3:19 PM, Junio C Hamano wrote:
"Neal Kreitzinger"<neal@xxxxxxxx> writes:
When git does a merges (merge/rebase/cherry-pick) it auto-resolves same-file
changes that do not conflict on the same line(s).
Technical Question: What are the recommended commands for reviewing the
files that auto-resolved after a "merge"?
Imagine that you are the maintainer of the mainline and are reviewing the
work made on a side branch that you just merged, but pretend that the
contribution came as a patch instead. How would you assess the damage to
your mainline?
You would use "git show --first-parent $commit" for that.
And then look at what the sideline wanted to do to the old baseline:
git log -p $commit^..$commit
which would, unless the person who worked on the side branch did a shoddy
job describing his work, explain what the side branch wanted to achieve
and also _how_ it wanted to achieve it.
And then re-read the first "git show" output with that knowledge, together
with the knowledge you have on your mainline codebase, and decide if the
solution used by the side branch is still valid. If it makes sense, you
are done. If the advance in your mainline since the side branch forked
invalidated some assumption the side branch made (e.g. a helper function
the side branch used has changed its meaning, a helper function the side
branch changed its meaning gained more callsite on the mainline, etc.),
you have a semantic conflict that you would need to address.
It is unclear what exactly you consider "auto-resolve" in your message, so
I'd refrain from commenting on the "Philosophical" part, at least for now.
Context: (git-merge manpage definition of merge-conflict) "During a
merge, the working tree files are updated to reflect the result of the
merge... When both sides made changes to the same area, however, git
cannot randomly pick one side over the other, and asks you to resolve it
by leaving what both sides did to that area."
My definition for "auto-resolve": "During a merge, the working tree
files are updated to reflect the result of the merge... When both sides
made changes to different areas of the same file, git picks both sides
automatically, and leaves its up to you to make sure you review those
merge results for correctness after git has made the merge commit."
IOW, an "auto-resolve" specifically means that both sides (ours and
theirs) made changes to file(a) since the common-ancestor version of
fila(a), and git picked both sides without raising a merge-conflict.
(The reason I came up with the term "auto-resolve" is because in the
git-merge output the term "Auto-merging" can also indicate that only one
side (theirs) changed file(a) since the common-ancestor and that git is
just "fast-forwarding" theirs file(a) on top of common-ancestor file(a).)
v/r,
neal
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html