On Thu, 2008-06-12 at 11:36 -0500, Andy Fleming wrote: > On Thu, Jun 12, 2008 at 11:00 AM, Becky Bruce <[EMAIL PROTECTED]> wrote: > > Bah - I thought I had updated my tree right before I sent that out. > > Not sure what happened here. Sorry about that, and thanks, Kumar! > > Your patch was applied after he pulled all the custodian trees. So > the patch probably conflicted with one (or more) of them. > > Andy
While I do not know how Wolfgang is applying patches, I might inject that adding a "-3" flag to a "git am" command might help as it will figure out some of these more complicated merges slightly better sometimes. (Wolfgang might already have done that and it still failed with conflicts, of course; I just don't know.) HTH, jdl ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
