@@ -124,24 +124,24 @@ Choose the right Branch
124
124
Before working on a PR, you must determine on which branch you need to
125
125
work:
126
126
127
- * ``3 .4 ``, if you are fixing a bug for an existing feature or want to make a
127
+ * ``4 .4 ``, if you are fixing a bug for an existing feature or want to make a
128
128
change that falls into the :doc: `list of acceptable changes in patch versions
129
129
</contributing/code/maintenance>` (you may have to choose a higher branch if
130
130
the feature you are fixing was introduced in a later version);
131
131
132
132
* ``5.x ``, if you are adding a new feature.
133
133
134
134
The only exception is when a new :doc: `major Symfony version </contributing/community/releases >`
135
- (4 .0, 5 .0, etc.) comes out every two years. Because of the
135
+ (5 .0, 6 .0, etc.) comes out every two years. Because of the
136
136
:ref: `special development process <major-version-development >` of those versions,
137
- you need to use the previous minor version for the features (e.g. use ``3 .4 ``
138
- instead of ``4 .0 ``, use ``4 .4 `` instead of ``5 .0 ``, etc.)
137
+ you need to use the previous minor version for the features (e.g. use ``4 .4 ``
138
+ instead of ``5 .0 ``, use ``5 .4 `` instead of ``6 .0 ``, etc.)
139
139
140
140
.. note ::
141
141
142
142
All bug fixes merged into maintenance branches are also merged into more
143
143
recent branches on a regular basis. For instance, if you submit a PR
144
- for the ``3 .4 `` branch, the PR will also be applied by the core team on
144
+ for the ``4 .4 `` branch, the PR will also be applied by the core team on
145
145
the ``5.x `` branch.
146
146
147
147
Create a Topic Branch
@@ -154,18 +154,18 @@ topic branch:
154
154
155
155
$ git checkout -b BRANCH_NAME 5.x
156
156
157
- Or, if you want to provide a bug fix for the ``3 .4 `` branch, first track the remote
158
- ``3 .4 `` branch locally:
157
+ Or, if you want to provide a bug fix for the ``4 .4 `` branch, first track the remote
158
+ ``4 .4 `` branch locally:
159
159
160
160
.. code-block :: terminal
161
161
162
- $ git checkout --track origin/3 .4
162
+ $ git checkout --track origin/4 .4
163
163
164
- Then create a new branch off the ``3 .4 `` branch to work on the bug fix:
164
+ Then create a new branch off the ``4 .4 `` branch to work on the bug fix:
165
165
166
166
.. code-block :: terminal
167
167
168
- $ git checkout -b BRANCH_NAME 3 .4
168
+ $ git checkout -b BRANCH_NAME 4 .4
169
169
170
170
.. tip ::
171
171
@@ -193,8 +193,8 @@ want to debug are installed by running ``composer install`` inside it.
193
193
194
194
.. tip ::
195
195
196
- If symlinks to your local Symfony fork cannot be resolved inside your project due to
197
- your dev environment (for instance when using Vagrant where only the current project
196
+ If symlinks to your local Symfony fork cannot be resolved inside your project due to
197
+ your dev environment (for instance when using Vagrant where only the current project
198
198
directory is mounted), you can alternatively use the ``--copy `` option.
199
199
When finishing testing your Symfony code into your project, you can use
200
200
the ``--rollback `` option to make your project back to its original dependencies.
@@ -285,7 +285,7 @@ while to finish your changes):
285
285
286
286
.. tip ::
287
287
288
- Replace ``5.x `` with the branch you selected previously (e.g. ``3 .4 ``)
288
+ Replace ``5.x `` with the branch you selected previously (e.g. ``4 .4 ``)
289
289
if you are working on a bug fix.
290
290
291
291
When doing the ``rebase `` command, you might have to fix merge conflicts.
@@ -312,8 +312,8 @@ You can now make a pull request on the ``symfony/symfony`` GitHub repository.
312
312
313
313
.. tip ::
314
314
315
- Take care to point your pull request towards ``symfony:3 .4 `` if you want
316
- the core team to pull a bug fix based on the ``3 .4 `` branch.
315
+ Take care to point your pull request towards ``symfony:4 .4 `` if you want
316
+ the core team to pull a bug fix based on the ``4 .4 `` branch.
317
317
318
318
To ease the core team work, always include the modified components in your
319
319
pull request message, like in:
@@ -403,7 +403,7 @@ Rework your Pull Request
403
403
404
404
Based on the feedback on the pull request, you might need to rework your
405
405
PR. Before re-submitting the PR, rebase with ``upstream/5.x `` or
406
- ``upstream/3 .4 ``, don't merge; and force the push to the origin:
406
+ ``upstream/4 .4 ``, don't merge; and force the push to the origin:
407
407
408
408
.. code-block :: terminal
409
409
0 commit comments