
Merge Mania!
Address
Bob Aiello raiello@acm.org
Bob Aiello – Behaviorally Speaking: Nov 2003
I am scared of merging code! I am scared of branching, because I will probably have to merge the code back later. Yet branching and merging are two of the most important techniques for Variant management – which is an essential skill for CM Practitioners (and most developers as well). Usually, CM gurus are asked to define the branching model and then troubleshoot when developers have obfuscated things beyond recognition. I have often found myself getting bullied into adopting a complex branching scheme that I know (from experience) will break from time to time. How much is enough to get the job done? Where should you draw the line when deciding how to use branching and merging in your applications? Read if you’d like to compare some notes on best practices in order to establish Just enough merging complexity to get the job done and yet avoid human error!
I am scared of merging code! I am scared of branching, because I will probably have to merge the code back later. Yet branching and merging are two of the most important techniques for Variant management – which is an essential skill for CM Practitioners (and most developers as well). Usually, CM gurus are asked to define the branching model and then troubleshoot when developers have obfuscated things beyond recognition. I have often found myself getting bullied into adopting a complex branching scheme that I know (from experience) will break from time to time. How much is enough to get the job done? Where should you draw the line when deciding how to use branching and merging in your applications? Read if you’d like to compare some notes on best practices in order to establish Just enough merging complexity to get the job done and yet avoid human error!
Reviews (0)
Be the first to review this listing!
