How to update master (#74)

* git command to update branch

* update dashboard

Author: jorisvandenbossche

pandas/dashboard.html

@@ -33,7 +33,7 @@ <h1 style="margin-left: 30px;">#pandasSprint</h1>
             <ol style="margin-left: 30px;">
                 <li><input type="checkbox"><a href="https://python-sprints.github.io/pandas/guide/pandas_setup.html">Install the environment</a>
                     <ul>
-                        <li><input type="checkbox">Make sure to update your local pandas with the latest upstream changes</li>
+                        <li><input type="checkbox">Make sure to <a href="https://python-sprints.github.io/pandas/guide/pandas_setup.html#create-a-branch-and-start-coding">update your local pandas</a> with the latest upstream changes</li>
                     </ul>
                 </li>
                 <li><input type="checkbox">Join the <a href="https://gitter.im/py-sprints/pandas-doc">Gitter channel</a></li>

pandas/guide/_sources/pandas_setup.rst.txt

@@ -122,7 +122,13 @@ to submit a pull request, so they are included in pandas.
    **Windows users**: run the next commands with Git Bash started at the cloned
    pandas folder.
 
-You can create a git branch running:
+Before creating a branch, make sure that you fetched the latest master version
+of the upstream pandas repository. You can do this with:
+
+    | ``git checkout master``
+    | ``git pull upstream master --ff-only``
+
+Then, you can create a new git branch running:
     | ``git checkout -b <new_branch_name>``
 
 The branch name should be descriptive of the feature you will work on. For

pandas/guide/pandas_setup.html

@@ -183,8 +183,16 @@ <h3>5. Create a branch and start coding<a class="headerlink" href="#create-a-bra
 <p class="last"><strong>Windows users</strong>: run the next commands with Git Bash started at the cloned
 pandas folder.</p>
 </div>
+<p>Before creating a branch, make sure that you fetched the latest master version
+of the upstream pandas repository. You can do this with:</p>
+<blockquote>
+<div><div class="line-block">
+<div class="line"><code class="docutils literal notranslate"><span class="pre">git</span> <span class="pre">checkout</span> <span class="pre">master</span></code></div>
+<div class="line"><code class="docutils literal notranslate"><span class="pre">git</span> <span class="pre">pull</span> <span class="pre">upstream</span> <span class="pre">master</span> <span class="pre">--ff-only</span></code></div>
+</div>
+</div></blockquote>
 <dl class="docutils">
-<dt>You can create a git branch running:</dt>
+<dt>Then, you can create a new git branch running:</dt>
 <dd><div class="first last line-block">
 <div class="line"><code class="docutils literal notranslate"><span class="pre">git</span> <span class="pre">checkout</span> <span class="pre">-b</span> <span class="pre">&lt;new_branch_name&gt;</span></code></div>
 </div>

pandas/guide/searchindex.js

@@ -122,7 +122,13 @@ to submit a pull request, so they are included in pandas.
    **Windows users**: run the next commands with Git Bash started at the cloned
    pandas folder.
 
-You can create a git branch running:
+Before creating a branch, make sure that you fetched the latest master version
+of the upstream pandas repository. You can do this with:
+
+    | ``git checkout master``
+    | ``git pull upstream master --ff-only``
+
+Then, you can create a new git branch running:
     | ``git checkout -b <new_branch_name>``
 
 The branch name should be descriptive of the feature you will work on. For