From: Luben Tuikov <ltuikov@yahoo.com>
Date: Mon, 31 Jul 2006 17:12:29 GMT
Subject: Re: git merge (resolve) _is_ stupid
Message-ID: <20060731171229.24870.qmail@web31802.mail.mud.yahoo.com>
In-Reply-To: <7v7j1u88ol.fsf@assigned-by-dhcp.cox.net>

I had seen something similar:

Merging linux-scsi into my own branches whereby both had a
particular patch (03aba2f79594ca94d159c8bab454de9bcc385b76),
git-merge complained that a resolve is needed.

After manually "resolving" the result was identical to
either branch (linux-scsi and my own), so in fact the
diff was 0.

I found this strange, but due to lack of time couldn't
pursue it further.

    Luben