Skip to content

Added a new troubleshooting section in the maintainer guide #14590

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

Closed
wants to merge 2 commits into from
Closed

Added a new troubleshooting section in the maintainer guide #14590

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
158648d
Added a new troubleshooting section in the maintainer guide
javiereguiluz Nov 21, 2020
2dc92e5
Update maintainer_guide.rst
javiereguiluz Nov 21, 2020
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
17 changes: 17 additions & 0 deletions _build/maintainer_guide.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,23 @@ in the tree as follows:
$ git push origin
$ git push upstream

Merging in the wrong branch
...........................

A Pull Request was made against ``5.x`` but it should be merged in ``5.1`` and you
forgot to merge as ``gh merge NNNNN -s 5.1`` to change the merge branch. Solution:

.. code-block:: terminal

$ git checkout 5.1
$ git cherry-pick <SHA OF YOUR MERGE COMMIT> -m 1
$ git checkout 5.x
$ git revert <SHA OF YOUR MERGE COMMIT> -m 1
# now continue with the normal "upmerging"
$ git checkout 5.2
$ git merge 5.1
$ ...

.. _`symfony/symfony-docs`: https://github.com/symfony/symfony-docs
.. _`Symfony Docs team`: https://github.com/orgs/symfony/teams/team-symfony-docs
.. _`Symfony's respectful review comments`: https://symfony.com/doc/current/contributing/community/review-comments.html
Expand Down