[Mpls-pm] Meeting tonight?

[Dave Rolsky]

On Wed, 13 Oct 2004, Ken Williams wrote:

> Oh, that much I knew.  But it always seems to ignore branch changes I'd
> previously merged in, and always gets confused by changes I've made in
> the head branch.  I was hoping for a way to do the merge without having
> to hold its hand through a million conflicts every time.

See my other email.  Every time you merge you should tag the branch you
merged into (and from, I think), so you can specify them.  See here for
details:
http://cvsbook.red-bean.com/cvsbook.html#Going%20Out%20On%20A%20Limb%20(How%20To%20Work%20With%20Branches%20And%20Survive)


/*===========================
VegGuide.Org
Your guide to all that's veg.
===========================*/