Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-03-17 06:30:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Daniel Greenfeld 2013-05-21 23:28:28 +02:00
parent ce835ffc79
commit e9fd0abb2f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/contributing.rst
View file

@ -86,7 +86,10 @@ Now when you go to your fork on GitHub, you will see this branch listed under
the "Source" tab where it says "Switch Branches". Go ahead and select your
topic branch from this list, and then click the "Pull request" button.
Here you can add a comment about your branch. If this in response to
Your pull request should be applied to the **develop** branch of django-admin2.
Be sure to change from the default of ``master`` to ``develop``.
Next, you can add a comment about your branch. If this in response to
a submitted issue, it is good to put a link to that issue in this initial
comment. The repo managers will be notified of your pull request and it will
be reviewed (see below for best practices). Note that you can continue to add
@ -104,7 +107,7 @@ Pull upstream changes into your fork regularly
To pull in upstream changes::
git remote add upstream https://github.com/twoscoops/django-admin2.git
git fetch upstream
git fetch upstream develop
Check the log to be sure that you actually want the changes, before merging::