> I'm a little unclear on the implications of a merge between a branch and > the trunk. If I merge, does the branch become part of the trunk from > then on?
Take a look at http://cvsbook.red-bean.com/cvsbook.html#Branches Merging merely creates a patch from the root of the branch (if you tagged it!) to the head of the branch and applies it to your target (which can be HEAD). So there is no real connection between branch tip and trunk. The changes nevertheless afterwards are part of trunk. In this paradigm you create branches and leave them after finishing the feature and merged the changes to trunk. HTH -- cu --== Jerri ==-- Homepage: http://www.jerri.de/ ICQ: 54160208 Public PGP Key: http://www.jerri.de/jerris_public_key.asc
signature.asc
Description: Digital signature
