[LinuxBIOS] Merge complete....
Ronald G. Minnich
rminnich at lanl.gov
Wed Jun 22 18:14:17 CEST 2005
On Wed, 22 Jun 2005, Li-Ta Lo wrote:
> On Wed, 2005-06-22 at 03:50 -0600, Eric W. Biederman wrote:
> > Ok. After I finally developed a sane common ancestor between
> > the two trees it did not take much time to finish the merge.
> > >From that ancestor linuxbios at linuxbios.org--devel/frebios--devel--2.0--base-0
> > I have merged each patch individually with star-merge and that worked
> > well allowing me to fix the small handful of conflicts that the new
> > development created.
> > I would love to move the changes into the public tree the same way but it does
> > not appear easily possible, instead it is trivial to simply merge my entire
> > tree into the public tree.
> > Since I want to avoid breaking things by acting too hastily I have
> > performed the merge and placed the code in the branch:
> > linuxbios at linuxbios.org--devel/freebios--lnxi--1--patch-1
> How am I going to check out that branch?
> [ollie at logarithm tmp]$ tla get linuxbios at linuxbios.org--devel/freebios--
> lxni--1 freebios_lxni
More information about the coreboot