Question: What is the difference between the logical and physical view of branches?

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

Answer

The physical view is the hierarchy that appears within your source tree, as shown in the following example:
  • $/MyTeamProject
    • Development
      • Source
    • Main
      • Source
    • Releases
      • Release1
        • Source
      • Release2
        • Source

Development, Main, Release1, and Release2 are branches that directly contain source code. Releases is a folder that contains multiple branches.

The logical view is the hierarchy of parent and child branches as they were created. This hierarchy is not shown in the source tree but can be visualized based on how each branch was created; for example:
  • Main
  • Development
  • Release1
  • Release2

The logical view is important because merging is easiest when you do it up and down, rather than across, the logical hierarchy. If you execute a merge across the hierarchy, you must perform a baseless merge, which requires use of the command line and significantly more conflict resolution.

Additional Resources


Last edited Jul 18, 2007 at 11:19 PM by jtaylorsi, version 6

Comments

No comments yet.