Skip to content

Commit 805df99

Browse files
committed
Merge pull request #983 from richardmiller/adding_contributing_branch_info
Adding contributing branch info
2 parents 032b177 + aadd089 commit 805df99

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

contributing/documentation/overview.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ then clone your fork:
2525
2626
$ git clone git://github.com/YOURUSERNAME/symfony-docs.git
2727
28+
Unless you're documenting a feature that's new to Symfony 2.1, you changes
29+
should be based on the 2.0 branch instead of the master branch. To do this
30+
checkout the 2.0 branch before the next step:
31+
32+
.. code-block:: bash
33+
34+
$ git checkout 2.0
35+
36+
2837
Next, create a dedicated branch for your changes (for organization):
2938

3039
.. code-block:: bash
@@ -39,6 +48,13 @@ the ``symfony-docs`` ``master`` branch.
3948
.. image:: /images/docs-pull-request.png
4049
:align: center
4150

51+
If you have made your changes based
52+
on the 2.0 branch then you need to follow the change commit link and change
53+
the base branch to be @2.0:
54+
55+
.. image:: /images/docs-pull-request-change-base.png
56+
:align: center
57+
4258
GitHub covers the topic of `pull requests`_ in detail.
4359

4460
.. note::
5.73 KB
Loading

0 commit comments

Comments
 (0)