git branch diagram

[<Patrick.Higgins@cexp.com>]

[-- Attachment #1: Type: text/plain, Size: 945 bytes --]

I am trying to get my employer to start using git and have found the distributed model and git's branching to be one of the hardest parts to explain and understand. I put together the attached diagram (done with graphviz so some things are not in the most logical place) to help explain things to my coworkers.

Unfortunately, I don't understand things well enough myself to know if the diagram is correct or not. I read in the stgit docs that developing directly in the master branch is discouraged by convention, but I don't really understand why. The git tutorial shows work happening directly in master, so I wasn't sure if that's a convention that only makes sense for stgit or for plain git, too.

In my diagram, I am assuming that most developers work in master, and make branches for their own long-lived projects and experimental things.

Does my diagram make sense? Are there any suggestions or corrections?

Thanks,
Patrick

[-- Attachment #2: git-branching.ps --]
[-- Type: application/postscript, Size: 27107 bytes --]

[-- Attachment #3: git-branching.dot --]
[-- Type: application/octet-stream, Size: 3136 bytes --]

digraph GIT
{
  node[shape = box];
  //clusterrank = none;
  ranksep=1;
  nodesep=.25;
  
  subgraph cluster_rel {
    label = "Release Repo";

    subgraph cluster_rel_t {
      label = "Tracking Branches";
      rel_im[label = "integration/master"];
    }

    subgraph cluster_rel_l {
      label = "Local Branches";
      rel_m[label = "master"];
    }
  }

  subgraph cluster_int {
    label = "Integration Repo";

    subgraph cluster_int_t {
      label = "Tracking Branches";
      int_p1m[label = "project1/master"];
      int_p2m[label = "project2/master"];
      int_p3m[label = "project3/master"];
    }

    subgraph cluster_int_l {
      label = "Local Branches";
      int_m[label = "master"];
    }
  }

  subgraph cluster_project {
    label = "Project Repo";

    subgraph cluster_prj_t {
      label = "Tracking Branches";
      prj_im[label = "integration/master"];
      prj_d1m[label = "dev1/master"];
      prj_d2m[label = "dev2/master"];
      prj_d3m[label = "dev3/master"];
    }

    subgraph cluster_prj_l {
      label = "Local Branches";
      prj_m[label = "master"];
    }
  }

  subgraph cluster_dev1 {
    label = "Dev 1 Repo";

    subgraph cluster_d1_t {
      label = "Tracking Branches";
      dev1_om[label = "origin/master"];
      dev1_d2[label = "dev2/master"];
    }

    subgraph cluster_d1_l {
      label = "Local Branches";
      dev1_m[label = "master"];
      dev1_e[label = "experimental"];
    }
  }

  subgraph cluster_dev2 {
    label = "Dev 2 Repo";

    subgraph cluster_d2_t {
      label = "Tracking Branches";
      dev2_om[label = "origin/master"];
      dev2_d1[label = "dev1/master"];
    }

    subgraph cluster_d2_l {
      label = "Local Branches";
      dev2_m[label = "master"];
    }
  }

  subgraph cluster_dev3 {
    label = "Dev 3 Repo";

    subgraph cluster_d3_t {
      label = "Tracking Branches";
      dev3_om[label = "origin/master"];
    }

    subgraph cluster_d3_l {
      label = "Local Branches";
      dev3_m[label = "master"];
      dev3_test[label = "mytest"];
    }
  }

  legend[shape=record, label="{GIT Branching|Intra-repo arrows are merges|Inter-repo arrows are pulls}"];

  prj_m -> dev1_om
  prj_m -> dev2_om
  prj_m -> dev3_om

  dev1_m -> prj_d1m
  dev2_m -> prj_d2m
  dev3_m -> prj_d3m

  dev1_m -> dev2_d1
  dev2_m -> dev1_d2

  prj_im  -> prj_m
  prj_d1m -> prj_m
  prj_d2m -> prj_m
  prj_d3m -> prj_m

  dev3_m -> dev3_test
  dev1_m -> dev1_e

  dev1_om -> dev1_m
  dev2_om -> dev2_m
  dev3_om -> dev3_m

  dev2_d1 -> dev2_m
  dev1_d2 -> dev1_e

  prj_m -> int_p1m
  int_p1m -> int_m
  int_p2m -> int_m
  int_p3m -> int_m

  int_m -> prj_im

  int_m -> rel_im
  rel_im -> rel_m [style=dotted,label="cherrypick"]

  release_builds[shape=doublecircle,label="Release Builds"];
  rel_m -> release_builds


  build_farm[shape=ellipse,label="Build Farm"]  
  project_builds[shape=doublecircle,label="Project Builds"];
  prj_m -> build_farm [style=dotted,label="on-commit"];
  build_farm -> project_builds

  project2[shape=plaintext];
  project3[shape=plaintext];

  project2 -> int_p2m [style=dotted];
  project3 -> int_p3m [style=dotted];
}