If you are going to be using a shared branch that already exists you can skip the branch setup steps and move right on to the steps for working on the branch, which are amazingly similar to what you do when working on your own local branch.
 
-{subsection: Decide on a branch name}
+{subsection: Make the branch and do bookkeeping}
 
-Our branch rationale and naming scheme is defined in GitNewBranchRules. Please
-follow it.
+Before going any further, you need to make the branch do some bookkeeping.
+*See GitNewBranchRules for details on this.*
 
-{code}
-# Lets decide on the name "V7_1-GreatFeature-branch". This means we
-# are going to branch from the end of V7_1-branch, so you should make
-# sure it is known to build on all platforms and pass all tests.
-$ git branch V7_1-GreatFeature-branch master
-
-# Now push that new branch to the central repository so everyone can
-# see it
-$ git push origin V7_1-GreatFeature-branch
-
-# You now have a local and central branch named V7_1-GreatFeature-branch,
-# but the local branch is not tracking the central branch, so "git
-# pull" won't get other peoples changes to the branch. Let's fix that
-# by recreating the local branch so that it tracks the central branch
-$ git branch -f V7_1-GreatFeature-branch origin/V7_1-GreatFeature-branch
-{endcode}
-
-{subsection: Document your branch}
-
-Second, you should document your branch and or tags in GitBranchDescriptions.
-
-The description should include the date, where the new branch came from, what
-it is for, and any plans for when/where it's going to be merged back into (if
-we know them).
-
-An example for a tag is:
-
-{verbatim}
-3/2/2010 V7_5_1
-The offical tag for 7.5.1, from the V7_5_1-branch.
-Version string: $CondorVersion: 7.5.1 Mar 1 2010 BuildID: 220663 $
-Original build tag: BUILD-V7_5_1-branch-2010-2-28_2
-{endverbatim}
-
-An example for a branch is:
-
-{verbatim}
-3/29/2010 V7_5_2-branch
-Branch for 7.5.2 release, created from BUILD-trunk-2010-3-27.
-{endverbatim}
-
-Please follow the markup style of the nearby entries.
-
-{subsection: Update the version string}
-
-Third, and finally, you should fix the version string on your new branch.  You do this by editing =src/condor_c++_util/condor_version.C= on your new branch.  The exact version you decide on is up to you, but as always you should only change the "comment" portion of he version string, i.e. anything after =__DATE__= and before =$=. For example, if the old version string (on the V6_5-branch) looked something like =static char* {quote:CondorVersionString} = "$CondorVersion: 6.5.3 " __DATE__ " $";= you might choose =static char* {quote:CondorVersionString} = "$CondorVersion: 6.5.3 " __DATE__ " PRE-RELEASE-UWCS $";=.
-
-{code}
-# Checkout the new branch
-$ git checkout V7_1-GreatFeature-branch
-
-# Fix src/condor_c++_util/condor_version.cpp
-
-# Commit your change
-$ git commit src/condor_c++_util/condor_version.cpp
-$ git push
-{endcode}
 
 {subsection: Get working}
 
 At this point you can go hog wild on the branch:
 
 {code}
+# Get the branch created above.
+$ git checkout V7_1-GreatFeature-branch
+
 # Hack hack hack
 
 # Commit your changes, these only go to your local copy of the branch