[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merge Management
From: |
Mike Castle |
Subject: |
Re: Merge Management |
Date: |
Wed, 25 Apr 2001 11:07:04 -0700 |
User-agent: |
Mutt/1.3.6i |
On Wed, Apr 25, 2001 at 10:28:43AM -0700, Zachary M. Smith wrote:
> What I think i'd like to do is try to do the merges myself and delegate
> conflict resolution responsibilities to developers but CVS does not appear to
> have a very clean way of doing this. Has anybody had any luck with doing
> things this way? Any tips or tricks to make it a bit smoother?
Usually what I do is the following:
Try the merge myself. Do a build and some simple tests. If all of those
pass, then I do the commit.
If anything fails, I document what I did (the exact cvs commands necessary
to generate the appropriate files, for instance) and pass that back to the
developer via email. This way I don't for a commit of invalid code into
the system, but the developer can still see things in the same way that I
did.
mrc
--
Mike Castle Life is like a clock: You can work constantly
address@hidden and be right all the time, or not work at all
www.netcom.com/~dalgoda/ and be right at least twice a day. -- mrc
We are all of us living in the shadow of Manhattan. -- Watchmen