Author: buildbot
Date: Sat Oct 3 00:47:47 2015
New Revision: 967567
Log:
Staging update by buildbot for oodt
Modified:
websites/staging/oodt/trunk/content/ (props changed)
websites/staging/oodt/trunk/content/development.html
Propchange: websites/staging/oodt/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Oct 3 00:47:47 2015
@@ -1 +1 @@
-1706080
+1706514
Modified: websites/staging/oodt/trunk/content/development.html
==============================================================================
--- websites/staging/oodt/trunk/content/development.html (original)
+++ websites/staging/oodt/trunk/content/development.html Sat Oct 3 00:47:47
2015
@@ -180,6 +180,10 @@ h2:hover > .headerlink, h3:hover > .head
<li><code>git init</code></li>
<li><code>git remote add origin
https://git-wip-us.apache.org/repos/asf/oodt.git</code></li>
<li><code>git fetch</code></li>
+ <li><code>git checkout -b merge-branch</code></li>
+ <li><code>git fetch --all</code></li>
+ <li><code>git reset --hard origin/master</code></li>
+ <li><code>git checkout master</code></li>
</ol>
<p>
The above will prepare your repository and enable you to sync
with the live development code maintained
