svn commit: r1422560 - /isis/site/trunk/content/contributors/release-process.md

[da...@apache.org]

Author: danhaywood
Date: Sun Dec 16 12:02:45 2012
New Revision: 1422560

URL: http://svn.apache.org/viewvc?rev=1422560&view=rev
Log:
isis site: more on release process, -RCn tags

Modified:
    isis/site/trunk/content/contributors/release-process.md

Modified: isis/site/trunk/content/contributors/release-process.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/release-process.md?rev=1422560&r1=1422559&r2=1422560&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/release-process.md (original)
+++ isis/site/trunk/content/contributors/release-process.md Sun Dec 16 12:02:45 2012
@@ -732,7 +732,7 @@ If the vote has been unsuccessful, then:
 * delete the remote branch, for example:
 
 <pre>
-  git push --origin --delete prepare/isis-1.2.3
+  git push origin --delete prepare/isis-1.2.3
 </pre>
 
 * delete your local branch, for example:
@@ -903,12 +903,13 @@ Finally, [log onto](https://blogs.apache
 Because we release from a branch, the changes made in the branch (changes to `pom.xml` made by the `maven-release-plugin`, or any manual edits) should be merged back from the release branch back into the `master` branch:
 
 <pre>
-git checkout master                # update master with latest
+git checkout master                           # update master with latest
 git pull
-git checkout prepare/isis-1.2.3    # apply branch commits onto master
+git checkout prepare/isis-1.2.3               # apply branch commits onto master
 git rebase master
 git checkout master
-git branch -D prepare/isis-1.2.3   # branch no longer needed
+git branch -D prepare/isis-1.2.3              # branch no longer needed
+git push origin --delete prepare/isis-1.2.3   # remote branch no longer needed
 </pre>
 
 Next, do a sanity check that everything builds ok: