From 9db79de5b08a5e7c0672d7973eebfa397e0351a0 Mon Sep 17 00:00:00 2001 From: Bruno Baguette <1922257+Levure@users.noreply.github.com> Date: Tue, 2 Nov 2021 21:42:29 +0100 Subject: [PATCH] =?UTF-8?q?Typo=20fix=20:=20failes=20=E2=9E=A4=20fails?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _build/maintainer_guide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_build/maintainer_guide.rst b/_build/maintainer_guide.rst index 8485bc3191d..7e5cbc8caba 100644 --- a/_build/maintainer_guide.rst +++ b/_build/maintainer_guide.rst @@ -356,7 +356,7 @@ Merging while the target branch changed ....................................... Sometimes, someone else merges a PR in ``5.x`` at the same time as you are -doing it. In these cases, ``gh merge ...`` failes to push. Solve this by +doing it. In these cases, ``gh merge ...`` fails to push. Solve this by resetting your local branch and restarting the merge: .. code-block:: terminal