Hi Stefano, On 4/13/2010 10:28 AM, Stefano Babic wrote: > Ben Warren wrote: > >> Hi Wolfgang, >> >> On 4/13/2010 2:23 AM, Wolfgang Denk wrote: >> >>> Hello Custodians, >>> >>> please note that I have applied Peter Tyser's "Reorganize directory >>> structure" patch series. This results in a massive change of the >>> directory structure. >>> >>> Please make sure to sync your repsitories ASAP. >>> >>> >>> >> Please excuse my ignorance, but what's the best way to do this? >> git-merge with the main branch? >> > Hi Ben, > > I do not know if there is a preferred or best way to do it, but in my > case a simple git-rebase with the main branch did the job ;). > > Stefano > > Thanks. I guess git-rebase would be better since that will put my net repo changes at the top.
regards, Ben _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
