svn commit: r842444 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/contributors/git-cookbook.html

[bu...@apache.org]

Author: buildbot
Date: Fri Dec 14 23:25:41 2012
New Revision: 842444

Log:
Staging update by buildbot for isis

Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/contributors/git-cookbook.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 14 23:25:41 2012
@@ -1 +1 @@
-1422093
+1422144

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 14 23:25:41 2012
@@ -1 +1 @@
-1422093
+1422144

Modified: websites/staging/isis/trunk/content/contributors/git-cookbook.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/git-cookbook.html (original)
+++ websites/staging/isis/trunk/content/contributors/git-cookbook.html Fri Dec 14 23:25:41 2012
@@ -287,14 +287,16 @@ git checkout <i>branchname</i>
 
 <p>Any changes in your working directory and index/staging area are <em>preserved</em>.  This makes it easy to separate out different strands of work... you realize that some set of changes just made should be on a different ticket, so you create a new branch and commit those changes there.</p>
 
-<p>When you want to reintegrate the changes into the branch, use:</p>
+<h2>Updating branch with latest</h2>
+
+<p>When you want to 'catch-up' with the changes made by others and in the remote <code>origin</code>, use:</p>
 
 <pre>
 git checkout <i>branchname</i>
 git rebase master
 </pre>
 
-<p>This will reapply the commits on top of the <code>master</code> branch.  If there are conflicts then they will occur a this point.  Conflicts are resolved by editing the file, then:</p>
+<p>This will reapply the commits from <code>origin</code> on top of the <code>master</code> branch.  If there are conflicts then they will occur a this point.  Conflicts are resolved by editing the file, then:</p>
 
 <pre>
 git add <i>filename</i>
@@ -316,6 +318,32 @@ git merge <i>branchname</i> --ff-only
 git branch -d <i>branchname</i>
 </pre>
 
+<h2>Push the changes</h2>
+
+<p>Immediately prior to pushing your changes, check one more time that you are up-to-date:</p>
+
+<pre>
+git fetch
+</pre>
+
+<p>If this pulls down any commits, then reintegrate first (using <code>git rebase</code>) and try again.</p>
+
+<p>Assuming that now new commits were brought down, you can now simply do a fast forward merge of master, and then push the changes:</p>
+
+<pre>
+git checkout master
+git merge --ff-only ISIS-123-blobs
+git push
+</pre>
+
+<p>Because the <code>master</code> branch is a direct ancestor of the topic branch, the fast-forward merge should work.  The <code>git push</code> then pushes those changes back to the master Isis repo.</p>
+
+<p>To clean up, you can delete your topic branch:</p>
+
+<pre>
+git branch -d ISIS-123-blobs
+</pre>
+
 <h2>Backing up a local branch</h2>
 
 <p>If committing to a local branch, the changes are still just that: local, and run risk of a disk failure or other disaster.</p>