From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Wed, 19 Dec 2012 20:37:26 +0100 Subject: [U-Boot] Conflicting commits for seaboard USB keyboard handling In-Reply-To: <50D158D9.7070209@wwwdotorg.org> References: <20121210192504.GA25496@badger> <20121211190209.GB25496@badger> <20121215174108.7d2cd36f@lilith> <20121217222251.GA11959@badger> <20121218180614.GA15608@badger> <20121219010807.GB15608@badger> <50D158D9.7070209@wwwdotorg.org> Message-ID: <20121219203726.0163f85e@lilith> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Stephen, On Tue, 18 Dec 2012 23:04:09 -0700, Stephen Warren wrote: > 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. There are several sources of conflicts in merging u-boot into u-boot-arm. I want all conflicts resolved by the persons who are best suited for resolving properly, then I'll merge all resolutions together. Amicalement, -- Albert.