Skip to content

Commit c8d9c56

Browse files
authored
Reference latest feature branch
1 parent dc9a534 commit c8d9c56

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

contributing/code/pull_requests.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ work:
129129
</contributing/code/maintenance>` (you may have to choose a higher branch if
130130
the feature you are fixing was introduced in a later version);
131131

132-
* ``5.x``, if you are adding a new feature.
132+
* ``6.1``, if you are adding a new feature.
133133

134134
The only exception is when a new :doc:`major Symfony version </contributing/community/releases>`
135135
(5.0, 6.0, etc.) comes out every two years. Because of the
@@ -152,7 +152,7 @@ topic branch:
152152

153153
.. code-block:: terminal
154154
155-
$ git checkout -b BRANCH_NAME 5.x
155+
$ git checkout -b BRANCH_NAME 6.1
156156
157157
Or, if you want to provide a bug fix for the ``4.4`` branch, first track the remote
158158
``4.4`` branch locally:
@@ -281,15 +281,15 @@ while to finish your changes):
281281

282282
.. code-block:: terminal
283283
284-
$ git checkout 5.x
284+
$ git checkout 6.1
285285
$ git fetch upstream
286-
$ git merge upstream/5.x
286+
$ git merge upstream/6.1
287287
$ git checkout BRANCH_NAME
288-
$ git rebase 5.x
288+
$ git rebase 6.1
289289
290290
.. tip::
291291

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``)
293293
if you are working on a bug fix.
294294

295295
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
502502

503503
.. code-block:: terminal
504504
505-
$ git rebase -f upstream/5.x
505+
$ git rebase -f upstream/6.1
506506
$ git push --force origin BRANCH_NAME
507507
508508
.. note::

0 commit comments

Comments
 (0)