Matthew K. Johnson – From the Trenches - November 2003
It has been my experience that developers like merging their files about as much as they like intestinal flu. Branching and then merging file versions back together can be a very powerful tool for configuration management, but your development staff must understand the tools used to accomplish the task. If they don’t, they will do everything they can to either avoid merging, or use some time consuming manual method to accomplish a similar result. In this month’s column of From the Trenches, we’ll discuss methods you can use to try and get your development staff on board with your merging tools and strategy.