$ git checkout V7_0-branch # pull it to make it up-to-date $ git pull -# And do the merge. All files merged cleanly are commited to the +# And do the merge. All files merged cleanly are committed to the # local V7_0-branch $ git merge GreatFeature # And, while you are still on the V7_0-branch, send your changes to # the central shared repo: -$ git push +$ git push origin V7_0-branch # Since we are finished with the GreatFeature branch, let's delete it. # The -d means validate that the branch was merged fully into HEAD. @@ -284,7 +284,7 @@ $ git commit -a # Push your changes to the central repo -$ git push +$ git push origin V7_1-GreatFeature-branch {endcode} {section: Creating a new development or stable series} @@ -407,7 +407,7 @@ # Make sure the new 7.1 branch builds and tests # Push the merge into the central repository for all to see -$ git push +$ git push origin master {endcode} {section: Checking out an older revision of Condor}