Dear Ben Warren, In message <4bc4aa08.1060...@gmail.com> you wrote: > > > 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 ;). ... > Thanks. I guess git-rebase would be better since that will put my net > repo changes at the top.
Normally we try to avoid rebasing the custodian repositories, at least their master branches which are being pulled from by many users. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Backed up the system lately? _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
