On Mon, May 17, 2010 at 03:23:11PM -0700, Uri Okrent wrote: > I haven't found this to be the case. Is there a merge tool that can > do this? I had assumed that git used some magic using the project's > history in order to resolve conflicts in a smart way. Will a merge tool > that only has $THEIRS, $OURS, and $BASE have enough information to > resolve conflicts as smart as git itself does when it produces the > unmerged file in your working tree? Git uses only $THEIRS, $OURS, and $BASE to do the merge. It doesn't look at the interim history at all. > > Most of the tools that mergetool supports out-of-the-box perform 3-way > > diffs, so I guess I'm curious what merge tool you're using. > I use xxdiff or diffuse (or more frequently, vim ;)) If you're using xxdiff, try "Global > Merge" from the menu (or the Ctrl-Alt-M shortcut) to have it automatically merge any non-contentious bits. -Peff -- 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