From 158648de31da92458d2267cab01839603774e8ea Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Sat, 21 Nov 2020 19:45:29 +0100 Subject: [PATCH 1/2] Added a new troubleshooting section in the maintainer guide --- _build/maintainer_guide.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/_build/maintainer_guide.rst b/_build/maintainer_guide.rst index 7eff3143941..8f701da7c61 100644 --- a/_build/maintainer_guide.rst +++ b/_build/maintainer_guide.rst @@ -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 -m 1 + $ git checkout 5.x + $ git revert -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 From 2dc92e515a3e2bdb2d0595c769bc447b92c5d9b8 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Sat, 21 Nov 2020 19:46:35 +0100 Subject: [PATCH 2/2] Update maintainer_guide.rst --- _build/maintainer_guide.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_build/maintainer_guide.rst b/_build/maintainer_guide.rst index 8f701da7c61..f5913a8e811 100644 --- a/_build/maintainer_guide.rst +++ b/_build/maintainer_guide.rst @@ -338,8 +338,8 @@ in the tree as follows: 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: +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