From mboxrd@z Thu Jan  1 00:00:00 1970
From: Grant Edwards <grant.b.edwards@gmail.com>
Date: Wed, 16 Dec 2009 20:03:34 +0000 (UTC)
Subject: [Buildroot] OT: git workflow question
References: <hgb3a3$88l$1@ger.gmane.org>
	<200912162100.23649.markus.heidelberg@web.de>
Message-ID: <hgbeem$jgr$1@ger.gmane.org>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

On 2009-12-16, Markus Heidelberg <markus.heidelberg@web.de> wrote:
> Grant Edwards, 2009-12-16:

>> Here's my question: why was there a conflict?
>
> I'm aware of 2 possible reasons: Either Peter has fixed
> something in your patch before he committed it

That is what happened.  He combined two patches into a single
commit (he may have fixed other things as well).

-- 
Grant Edwards                   grante             Yow! What GOOD is a
                                  at               CARDBOARD suitcase ANYWAY?
                               visi.com