Plan Your Branching Structure Along Merge Paths

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

You can only merge along existing branch paths by using Source Control Explorer. You can do baseless merges along other paths from the command line, but this type of merge is less intelligent, resulting in more merge conflicts and additional conflicts in future merges.

Keep the following in mind when you perform merges:
  • Merging along the hierarchy, from parent to child or from child to parent, results in fewer conflicts than merging across the hierarchy.
  • The branch hierarchy is based on the branch parent and branch child, which may be different than the physical structure of the source code on disk. For example:
  • Physical Structure:
    • Development – Development branch
    • Main – Integration branch
    • Releases – Container for release branches
      • Release 1 – Release Branch
  • Logical Structure:
    • Main
      • Development
      • Release 1

Additional Resources

Last edited Jul 26, 2007 at 10:15 AM by prashantbansode, version 5

Comments

No comments yet.