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

Re: Merging adjacent deleted lines?

From
Jonathan del Strother <maillist@steelskies.com>
Date
Jan 22, 2009, 10:57 UTC
Message-ID
<57518fd10901220257p62b6d1efof97ba3fcf90dbfda@mail.gmail.com>
In-Reply-To
<7vy6x4cqq1.fsf@gitster.siamese.dyndns.org>

On Wed, Jan 21, 2009 at 7:49 PM, Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:

Show 6 quoted lines
> onsdag 21 januari 2009 20:20:50 skrev Jonathan del Strother:
> [...]
> I think you've illustrated a case for graphical merge resolution tools, i.e.
> run git mergetool to help resolve the conlicts. It will run a graphical tool
> for you.
>

Mmm. I use opendiff, which is generally ok, but in this case produced a merge looking like this : http://pastie.org/paste/asset/367587/Picture_6.png Which, in my mind, isn't any clearer about the fact that both lines ought to be deleted than the text conflict markers are. Do any of the other graphical tools present conflicts like that differently?

On Wed, Jan 21, 2009 at 9:08 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 6 quoted lines
> But that is only true if it is obvious to you.  When you cannot remember
> what each side did since they forked, there are two ways you can use to
> understand the history better without resorting to graphical merge tools.
>
>  $ git log -p --merge <path>
>
Ahh, that's very helpful - thanks.
Previous: Junio C HamanoNext: Robin Rosenberg
Message 4 of 9 in “Merging adjacent deleted lines?”
  1. Jonathan del StrotherJan 21, 2009
  2. Robin RosenbergJan 21, 2009
  3. Junio C HamanoJan 21, 2009
  4. Jonathan del StrotherJan 22, 2009
  5. Robin RosenbergJan 22, 2009
  6. Jay SoffianJan 23, 2009
  7. Robin RosenbergJan 23, 2009
  8. Jay SoffianJan 23, 2009
  9. Jay SoffianJan 23, 2009

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.