Dear Ben Warren,

In message <4bc4a09d.20...@gmail.com> you wrote:
> 
> > 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?

Yes, or - which, assuming your main branch is current, is equivalent -
pull from the master branch of the mainline repo.

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
Defaults are wonderful, just like fire.
                  - Larry Wall in <1996mar6.004121.27...@netlabs.com>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to