Skip to content

How to update master #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jorisvandenbossche merged 2 commits into from
Mar 10, 2018
Merged

How to update master #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae6e533
git command to update branch
jorisvandenbossche Mar 10, 2018
047b873
update dashboard
jorisvandenbossche Mar 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pandas/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion pandas/guide/_sources/pandas_setup.rst.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion pandas/guide/pandas_setup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pandas/guide/searchindex.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion pandas/guide/source/pandas_setup.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down