On Thu, Feb 19, 2004 at 01:21:47PM -0800, Paul Sander wrote:
Chances are you're using the default common ancestor for each merge. The
3-way merge algorithm then rediscovers each change made cumulatively on both
branches each time. The solution is to specify the result of the last merge
as
We now have developers working in multiple branches.
When ready I merged their branches into a release branch.
When merging I'm finding myself fixing the same conflicts over and
over.
I have a feeling I'm missing something simple in our process. Any enlightenment?
I'll be modifying our development process here at the office from 3
tier (development-stage-production) to 4 tier
(development-stage-release-production) and I'm trying to make sure
I have the best CVS plan.
Any feedback (good and bad) would be great. I'm not sure if I'm way
off base here or if
I think I'm looking for custom loginfo tags, but I'm not sure.
The spec is the ability to do a custom action based on commit log
text. e.g. When the following text is put into the commit log entry
an action would be done:
- - - - - - -
Added the foobar feature and did some spelling updates.
