[Buildroot] OT: git workflow question
Grant Edwards
grant.b.edwards at gmail.com
Wed Dec 16 20:03:34 UTC 2009
On 2009-12-16, Markus Heidelberg <markus.heidelberg at 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
More information about the buildroot
mailing list