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 -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de ===================================================================== _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
