From 1fa638c2640ad604455689b0106003d12ed03cb2 Mon Sep 17 00:00:00 2001 From: Stan Ulbrych Date: Wed, 3 Jun 2026 13:45:55 +0100 Subject: [PATCH] Add link to devguide section on backporting in failure message --- miss_islington/tasks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/miss_islington/tasks.py b/miss_islington/tasks.py index 80859efa..89e9af37 100644 --- a/miss_islington/tasks.py +++ b/miss_islington/tasks.py @@ -198,7 +198,7 @@ async def backport_task_asyncio( issue_number, f"""\ Sorry, {util.get_participants(created_by, merged_by)}, I could not cleanly backport this to `{branch}` due to a conflict. - Please backport using [cherry_picker](https://pypi.org/project/cherry-picker/) on command line. + Please backport manually with the [cherry_picker](https://pypi.org/project/cherry-picker/) tool, see the [Backporting merged changes](https://devguide.python.org/getting-started/git-boot-camp/#backporting-merged-changes) section in the Python developer's guide for more information. ``` cherry_picker {commit_hash} {branch} ``` @@ -223,7 +223,7 @@ async def backport_task_asyncio( f"""\ Sorry {util.get_participants(created_by, merged_by)}, I had trouble completing the backport. Please retry by removing and re-adding the "needs backport to {branch}" label. - Please backport backport using [cherry_picker](https://pypi.org/project/cherry-picker/) on the command line. + If that does not work, please backport manually with the [cherry_picker](https://pypi.org/project/cherry-picker/) tool, see the [Backporting merged changes](https://devguide.python.org/getting-started/git-boot-camp/#backporting-merged-changes) section in the Python developer's guide for more information. ``` cherry_picker {commit_hash} {branch} ```