git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Question: start mergetool with trivial differences already handled?

From
Jeff King <peff@peff.net>
Date
May 17, 2010, 22:41 UTC
Message-ID
<20100517224117.GA12092@coredump.intra.peff.net>
In-Reply-To
<AANLkTilLX8fWto-xL261Bkj_2fhRDqBPakP7l83QNDBj@mail.gmail.com>
On Mon, May 17, 2010 at 03:23:11PM -0700, Uri Okrent wrote:
Show 6 quoted lines
> 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
Previous: Uri Okrent
Message 4 of 4 in “Question: start mergetool with trivial differences already handled?”
  1. Uri OkrentMay 17, 2010
  2. Jay SoffianMay 17, 2010
  3. Uri OkrentMay 17, 2010
  4. Jeff KingMay 17, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.