Do Not Branch Too Deeply

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

Do not branch too deeply because this will add to the time required to merge a change from a child branch up to the topmost parent. For example, in the following branching structure:
  • Development – Container for development branches
    • Development Branch
      • Sub-Branch
        • Sub-Sub-Branch
  • Main – Integration Branch
    • Source
    • Other Asset Folders

Merges result in fewer conflicts when performed along the branch hierarchy. Therefore, if there is a change in the Sub-Sub-Branch that you would like to merge into Main, you would first need to merge with the Sub-Branch and the Development Branch before you can merge into Main. Each merge takes time to complete, resolve conflicts, build, and test, which multiplies merge time by the level of branches you have created in your branch structure.

Additional Resources

Last edited Jul 26, 2007 at 9:17 AM by prashantbansode, version 4

Comments

No comments yet.