Introduction to Ubuntu Distributed Development

[Mackenzie Morgan]

On Saturday 19 December 2009 4:08:24 am Chow Loong Jin wrote:
> On Friday 18,December,2009 12:40 AM, Scott James Remnant wrote:
> > Right now, that vote would be:
> >
> >  ( ) continue using the existing apt-get source infrastructure, and
> >      contribute by sending debdiffs around; merge from Debian by hand,
> >      etc.
> >  ( ) use the new bzr infrastructure, contribute directly to revision
> >      control branches, merge using native merge support
> >
> > Because there is no Git or Mercurial infrastructure.
> 
> I might be getting the definition of "merge by hand" wrong, but I believe
>  nobody actually does a merge by hand anymore, since there's M-o-M for
>  everything that isn't already tracked in git, bzr, or mercurial. 

Yes they do. Daniel Chen was just saying to me last night that I ought to be 
able to merge by hand instead of using MoM, like he does.

-- 
Mackenzie Morgan
http://ubuntulinuxtipstricks.blogspot.com
apt-get moo