@@ -113,7 +113,7 @@ Choose the right Branch
113
113
Before working on a patch, you must determine on which branch you need to
114
114
work:
115
115
116
- * ``2.3 ``, if you are fixing a bug for an existing feature or want to make a
116
+ * ``2.7 ``, if you are fixing a bug for an existing feature or want to make a
117
117
change that falls into the :doc: `list of acceptable changes in patch versions
118
118
</contributing/code/maintenance>` (you may have to choose a higher branch if
119
119
the feature you are fixing was introduced in a later version);
@@ -124,7 +124,7 @@ work:
124
124
125
125
All bug fixes merged into maintenance branches are also merged into more
126
126
recent branches on a regular basis. For instance, if you submit a patch
127
- for the ``2.3 `` branch, the patch will also be applied by the core team on
127
+ for the ``2.7 `` branch, the patch will also be applied by the core team on
128
128
the ``master `` branch.
129
129
130
130
Create a Topic Branch
@@ -137,18 +137,18 @@ topic branch:
137
137
138
138
$ git checkout -b BRANCH_NAME master
139
139
140
- Or, if you want to provide a bugfix for the ``2.3 `` branch, first track the remote
141
- ``2.3 `` branch locally:
140
+ Or, if you want to provide a bugfix for the ``2.7 `` branch, first track the remote
141
+ ``2.7 `` branch locally:
142
142
143
143
.. code-block :: bash
144
144
145
- $ git checkout -t origin/2.3
145
+ $ git checkout -t origin/2.7
146
146
147
- Then create a new branch off the ``2.3 `` branch to work on the bugfix:
147
+ Then create a new branch off the ``2.7 `` branch to work on the bugfix:
148
148
149
149
.. code-block :: bash
150
150
151
- $ git checkout -b BRANCH_NAME 2.3
151
+ $ git checkout -b BRANCH_NAME 2.7
152
152
153
153
.. tip ::
154
154
@@ -236,7 +236,7 @@ while to finish your changes):
236
236
237
237
.. tip ::
238
238
239
- Replace ``master `` with the branch you selected previously (e.g. ``2.3 ``)
239
+ Replace ``master `` with the branch you selected previously (e.g. ``2.7 ``)
240
240
if you are working on a bugfix
241
241
242
242
When doing the ``rebase `` command, you might have to fix merge conflicts.
@@ -263,8 +263,8 @@ You can now make a pull request on the ``symfony/symfony`` GitHub repository.
263
263
264
264
.. tip ::
265
265
266
- Take care to point your pull request towards ``symfony:2.3 `` if you want
267
- the core team to pull a bugfix based on the ``2.3 `` branch.
266
+ Take care to point your pull request towards ``symfony:2.7 `` if you want
267
+ the core team to pull a bugfix based on the ``2.7 `` branch.
268
268
269
269
To ease the core team work, always include the modified components in your
270
270
pull request message, like in:
@@ -335,7 +335,7 @@ Rework your Patch
335
335
336
336
Based on the feedback on the pull request, you might need to rework your
337
337
patch. Before re-submitting the patch, rebase with ``upstream/master `` or
338
- ``upstream/2.3 ``, don't merge; and force the push to the origin:
338
+ ``upstream/2.7 ``, don't merge; and force the push to the origin:
339
339
340
340
.. code-block :: bash
341
341
0 commit comments