Do Not Branch Unless You Need To

- J.D. Meier, Jason Taylor, Alex Mackman, Prashant Bansode

Do not branch unless your development team needs to work on the same set of files concurrently. If you are unsure, you can label a build and create a branch from that build at a later point. Merging branches can be costly, especially if there are significant changes between them.

Merging requires one or more developers to execute the merge and sort out conflicts. The merged source must be thoroughly tested because it is not uncommon to make bad merge decisions that can destabilize the build.

Merging across the branch hierarchy is especially difficult and requires you to manually handle many conflicts that could otherwise be handled automatically.

Additional Resources

Last edited Jul 26, 2007 at 10:17 AM by prashantbansode, version 3

Comments

No comments yet.