From: Grant Edwards <grant.b.edwards@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] OT: git workflow question
Date: Wed, 16 Dec 2009 20:03:34 +0000 (UTC) [thread overview]
Message-ID: <hgbeem$jgr$1@ger.gmane.org> (raw)
In-Reply-To: 200912162100.23649.markus.heidelberg@web.de
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
next prev parent reply other threads:[~2009-12-16 20:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-16 16:53 [Buildroot] OT: git workflow question Grant Edwards
2009-12-16 19:37 ` Thomas Petazzoni
2009-12-16 20:05 ` Grant Edwards
2009-12-16 20:20 ` Peter Korsgaard
2009-12-16 20:06 ` Markus Heidelberg
2009-12-17 21:40 ` Julien Boibessot
2009-12-16 19:56 ` Chris Packham
2009-12-16 20:00 ` Markus Heidelberg
2009-12-16 20:03 ` Grant Edwards [this message]
[not found] <mailman.5919.1260994066.28478.buildroot@busybox.net>
2009-12-18 8:08 ` Vellemans, Noel
2009-12-18 12:04 ` Lionel Landwerlin
2009-12-18 14:22 ` Chris Packham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='hgbeem$jgr$1@ger.gmane.org' \
--to=grant.b.edwards@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox