@@ -106,7 +106,7 @@ Choose the right Branch
106
106
Before working on a patch, you must determine on which branch you need to
107
107
work:
108
108
109
- * ``2.8 ``, if you are fixing a bug for an existing feature or want to make a
109
+ * ``3.4 ``, if you are fixing a bug for an existing feature or want to make a
110
110
change that falls into the :doc: `list of acceptable changes in patch versions
111
111
</contributing/code/maintenance>` (you may have to choose a higher branch if
112
112
the feature you are fixing was introduced in a later version);
@@ -117,7 +117,7 @@ work:
117
117
118
118
All bug fixes merged into maintenance branches are also merged into more
119
119
recent branches on a regular basis. For instance, if you submit a patch
120
- for the ``2.8 `` branch, the patch will also be applied by the core team on
120
+ for the ``3.4 `` branch, the patch will also be applied by the core team on
121
121
the ``master `` branch.
122
122
123
123
Create a Topic Branch
@@ -130,18 +130,18 @@ topic branch:
130
130
131
131
$ git checkout -b BRANCH_NAME master
132
132
133
- Or, if you want to provide a bugfix for the ``2.8 `` branch, first track the remote
134
- ``2.8 `` branch locally:
133
+ Or, if you want to provide a bugfix for the ``3.4 `` branch, first track the remote
134
+ ``3.4 `` branch locally:
135
135
136
136
.. code-block :: terminal
137
137
138
- $ git checkout -t origin/2.8
138
+ $ git checkout -t origin/3.4
139
139
140
- Then create a new branch off the ``2.8 `` branch to work on the bugfix:
140
+ Then create a new branch off the ``3.4 `` branch to work on the bugfix:
141
141
142
142
.. code-block :: terminal
143
143
144
- $ git checkout -b BRANCH_NAME 2.8
144
+ $ git checkout -b BRANCH_NAME 3.4
145
145
146
146
.. tip ::
147
147
@@ -245,7 +245,7 @@ while to finish your changes):
245
245
246
246
.. tip ::
247
247
248
- Replace ``master `` with the branch you selected previously (e.g. ``2.8 ``)
248
+ Replace ``master `` with the branch you selected previously (e.g. ``3.4 ``)
249
249
if you are working on a bugfix
250
250
251
251
When doing the ``rebase `` command, you might have to fix merge conflicts.
@@ -272,8 +272,8 @@ You can now make a pull request on the ``symfony/symfony`` GitHub repository.
272
272
273
273
.. tip ::
274
274
275
- Take care to point your pull request towards ``symfony:2.8 `` if you want
276
- the core team to pull a bugfix based on the ``2.8 `` branch.
275
+ Take care to point your pull request towards ``symfony:3.4 `` if you want
276
+ the core team to pull a bugfix based on the ``3.4 `` branch.
277
277
278
278
To ease the core team work, always include the modified components in your
279
279
pull request message, like in:
@@ -344,7 +344,7 @@ Rework your Patch
344
344
345
345
Based on the feedback on the pull request, you might need to rework your
346
346
patch. Before re-submitting the patch, rebase with ``upstream/master `` or
347
- ``upstream/2.8 ``, don't merge; and force the push to the origin:
347
+ ``upstream/3.4 ``, don't merge; and force the push to the origin:
348
348
349
349
.. code-block :: terminal
350
350
0 commit comments