[cvsnt] Branching and Merging advice needed (parallel development)
Glen Starrett
grstarrett at cox.net
Thu Dec 4 00:01:36 GMT 2003
> 1. A dev creates a branch off the "MAIN" trunk called "Branch_A"
> 2. A second dev creates a branch off the main trunk called
> "Branch_B" -
> same point as what DEV 1 did
> 3. Both devlopers continue work on their branches . and at
> some point,
> Dev1 is done with his changes .. and decides to merge onto MAIN
> 4. Bcoz we follow "heavy" tagging .. the dev tag his
> "final" revision
[snip]
You should read the info available on mergepoints, it removed the
requirement to use "heavy tagging" with CVS. Some experimentation with
cvsnt should resolve most of your questions & concerns.
http://www.cvsnt.org/wiki/MergePoint
Glen Starrett
More information about the cvsnt
mailing list