"If it hurts - do it more often". Good advice if the amount of pain raises exponentially with the time between actions, such as for integrating software.| martinfowler.com
Mainline, Feature Branching, Continuous Integration, Release Branch and a clutch of other handy patterns.| martinfowler.com