From: Stephen Warren <swarren@wwwdotorg.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] Conflicting commits for seaboard USB keyboard handling
Date: Tue, 18 Dec 2012 23:04:09 -0700 [thread overview]
Message-ID: <50D158D9.7070209@wwwdotorg.org> (raw)
In-Reply-To: <20121219010807.GB15608@badger>
On 12/18/2012 06:08 PM, Allen Martin wrote:
...
> The other alternative is I could provide the conflict resolved files
> or instructions for how to resolve.
Aren't the two sets of files that conflict those that are already in
u-boot/master and u-boot-arm/master? If so, only Albert can resolve the
conflict, by doing a merge. I already did that merge locally a while
back in order to pick up the changes from both branches, and it didn't
seem hard; what's the problem here? If Allen can push out a branch for
Albert to use as an example to make sure he gets the correct merge
result, that seems like a very simple solution.
next prev parent reply other threads:[~2012-12-19 6:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-09 6:03 [U-Boot] Conflicting commits for seaboard USB keyboard handling Albert ARIBAUD
2012-12-10 16:25 ` Tom Warren
2012-12-10 16:59 ` Tom Warren
2012-12-10 19:25 ` Allen Martin
2012-12-10 21:15 ` Tom Warren
2012-12-10 21:51 ` Tom Warren
2012-12-11 19:02 ` Allen Martin
2012-12-15 16:41 ` Albert ARIBAUD
2012-12-17 22:13 ` Tom Warren
2012-12-17 22:22 ` Allen Martin
2012-12-18 16:43 ` Tom Warren
2012-12-18 18:06 ` Allen Martin
2012-12-18 23:59 ` Tom Warren
2012-12-19 1:08 ` Allen Martin
2012-12-19 6:04 ` Stephen Warren [this message]
2012-12-19 19:37 ` Albert ARIBAUD
2012-12-19 21:11 ` Allen Martin
2012-12-19 22:42 ` Albert ARIBAUD
2012-12-20 0:32 ` Allen Martin
2012-12-20 17:16 ` Tom Warren
2012-12-13 19:20 ` Albert ARIBAUD
2012-12-14 16:48 ` Tom Warren
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=50D158D9.7070209@wwwdotorg.org \
--to=swarren@wwwdotorg.org \
--cc=u-boot@lists.denx.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.