Skip to content

Reference latest feature branch #16628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2022
Merged

Reference latest feature branch #16628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions contributing/code/pull_requests.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ work:
</contributing/code/maintenance>` (you may have to choose a higher branch if
the feature you are fixing was introduced in a later version);

* ``5.x``, if you are adding a new feature.
* ``6.1``, if you are adding a new feature.

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

.. code-block:: terminal

$ git checkout -b BRANCH_NAME 5.x
$ git checkout -b BRANCH_NAME 6.1

Or, if you want to provide a bug fix for the ``4.4`` branch, first track the remote
``4.4`` branch locally:
Expand Down Expand Up @@ -281,15 +281,15 @@ while to finish your changes):

.. code-block:: terminal

$ git checkout 5.x
$ git checkout 6.1
$ git fetch upstream
$ git merge upstream/5.x
$ git merge upstream/6.1
$ git checkout BRANCH_NAME
$ git rebase 5.x
$ git rebase 6.1

.. tip::

Replace ``5.x`` with the branch you selected previously (e.g. ``4.4``)
Replace ``6.1`` with the branch you selected previously (e.g. ``4.4``)
if you are working on a bug fix.

When doing the ``rebase`` command, you might have to fix merge conflicts.
Expand Down Expand Up @@ -502,7 +502,7 @@ PR. Before re-submitting the PR, rebase with ``upstream/5.x`` or

.. code-block:: terminal

$ git rebase -f upstream/5.x
$ git rebase -f upstream/6.1
$ git push --force origin BRANCH_NAME

.. note::
Expand Down