From: Jonathan del Strother <maillist@steelskies.com>
Date: Thu, 22 Jan 2009 10:57:41 GMT
Subject: Re: Merging adjacent deleted lines?
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:
> 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:
> 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.