Merge Frequently

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

Eliminate the latency between branches, especially when teams are working on the same release but in their own isolated branch. This ensures compatibility between changes.

The merge schedule depends on the complexity of your branch structure as well as the individual needs of your development team. As an example, in a moderately complex branch structure such as the one below, the development branches may merge up to the main branch daily and merge changes back from the integration branch every couple of days.
  • Development – Folder for isolated development branches
    • External - External dependency branch
    • Team 1 - Team branch
    • Team 2 - Team branch
      • Feature A – Feature branch
      • Feature B – Feature branch
      • Feature C – Feature branch
  • Main – Integration branch
  • Releases - Folder for release branches
    • Release 2 – Release Branch
  • Safe Keeping - Folder for safekeeping branches
    • Release 1 - Safekeeping branch

Additional Resources

Last edited Jul 26, 2007 at 9:21 AM by prashantbansode, version 3

Comments

No comments yet.