diff --git a/docs/contributing.rst b/docs/contributing.rst index 20a62e9..5cfeec2 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -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::