@@ -129,7 +129,7 @@ work:
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
- * ``5.x ``, if you are adding a new feature.
132
+ * ``6.1 ``, 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
135
(5.0, 6.0, etc.) comes out every two years. Because of the
@@ -152,7 +152,7 @@ topic branch:
152
152
153
153
.. code-block :: terminal
154
154
155
- $ git checkout -b BRANCH_NAME 5.x
155
+ $ git checkout -b BRANCH_NAME 6.1
156
156
157
157
Or, if you want to provide a bug fix for the ``4.4 `` branch, first track the remote
158
158
``4.4 `` branch locally:
@@ -281,15 +281,15 @@ while to finish your changes):
281
281
282
282
.. code-block :: terminal
283
283
284
- $ git checkout 5.x
284
+ $ git checkout 6.1
285
285
$ git fetch upstream
286
- $ git merge upstream/5.x
286
+ $ git merge upstream/6.1
287
287
$ git checkout BRANCH_NAME
288
- $ git rebase 5.x
288
+ $ git rebase 6.1
289
289
290
290
.. tip ::
291
291
292
- Replace ``5.x `` with the branch you selected previously (e.g. ``4.4 ``)
292
+ Replace ``6.1 `` with the branch you selected previously (e.g. ``4.4 ``)
293
293
if you are working on a bug fix.
294
294
295
295
When doing the ``rebase `` command, you might have to fix merge conflicts.
@@ -502,7 +502,7 @@ PR. Before re-submitting the PR, rebase with ``upstream/5.x`` or
502
502
503
503
.. code-block :: terminal
504
504
505
- $ git rebase -f upstream/5.x
505
+ $ git rebase -f upstream/6.1
506
506
$ git push --force origin BRANCH_NAME
507
507
508
508
.. note ::
0 commit comments