Skip to content

Commit e50e444

Browse files
mjhea0mjhea0
committed
updates to contrinuting guide - added info about upstream
1 parent 8e35971 commit e50e444

3 files changed

Lines changed: 27 additions & 7 deletions

File tree

‎CONTRIBUTING.rst‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,28 @@ development.
4040
$ source venvs/fsp/bin/activate
4141
$ cd fsp
4242

43-
1. Install the requirements:
43+
1. Install the requirements::
4444

4545
$ pip install -r source/requirements.txt
4646

4747
Note: make changes to the source/content/pages/\*.rst files then execute a
4848
*make run* command from the source/ directory.
4949

50-
6. Commit your changes and push your branch to GitHub::
50+
1. Commit your changes and push your branch to GitHub::
5151

5252
$ git add .
5353
$ git commit -m "Your detailed description of your changes."
5454
$ git push origin gh-pages
5555

56-
7. Submit a pull request through the GitHub website.
56+
1. Submit a pull request through the GitHub website.
57+
58+
1. To keep your fork in sync with the original repo, add an `upstream remote <https://help.github.com/articles/configuring-a-remote-for-a-fork/>`_::
59+
60+
$ git remote add upstream [email protected]:makaimc/fullstackpython.com.git
61+
62+
1. Sync your repo with the original repo::
63+
64+
$ git checkout master
65+
$ git fetch upstream
66+
$ git merge upstream/master
5767

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-14T09:42:37Z</updated></feed>
2+
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-16T11:12:33Z</updated></feed>

‎source/static-html/CONTRIBUTING.rst‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,28 @@ development.
4040
$ source venvs/fsp/bin/activate
4141
$ cd fsp
4242

43-
1. Install the requirements:
43+
1. Install the requirements::
4444

4545
$ pip install -r source/requirements.txt
4646

4747
Note: make changes to the source/content/pages/\*.rst files then execute a
4848
*make run* command from the source/ directory.
4949

50-
6. Commit your changes and push your branch to GitHub::
50+
1. Commit your changes and push your branch to GitHub::
5151

5252
$ git add .
5353
$ git commit -m "Your detailed description of your changes."
5454
$ git push origin gh-pages
5555

56-
7. Submit a pull request through the GitHub website.
56+
1. Submit a pull request through the GitHub website.
57+
58+
1. To keep your fork in sync with the original repo, add an `upstream remote <https://help.github.com/articles/configuring-a-remote-for-a-fork/>`_::
59+
60+
$ git remote add upstream [email protected]:makaimc/fullstackpython.com.git
61+
62+
1. Sync your repo with the original repo::
63+
64+
$ git checkout master
65+
$ git fetch upstream
66+
$ git merge upstream/master
5767

0 commit comments

Comments
 (0)