Skip to content

Commit 1fa638c

Browse files
Add link to devguide section on backporting in failure message
1 parent e349557 commit 1fa638c

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

miss_islington/tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ async def backport_task_asyncio(
198198
issue_number,
199199
f"""\
200200
Sorry, {util.get_participants(created_by, merged_by)}, I could not cleanly backport this to `{branch}` due to a conflict.
201-
Please backport using [cherry_picker](https://pypi.org/project/cherry-picker/) on command line.
201+
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.
202202
```
203203
cherry_picker {commit_hash} {branch}
204204
```
@@ -223,7 +223,7 @@ async def backport_task_asyncio(
223223
f"""\
224224
Sorry {util.get_participants(created_by, merged_by)}, I had trouble completing the backport.
225225
Please retry by removing and re-adding the "needs backport to {branch}" label.
226-
Please backport backport using [cherry_picker](https://pypi.org/project/cherry-picker/) on the command line.
226+
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.
227227
```
228228
cherry_picker {commit_hash} {branch}
229229
```

0 commit comments

Comments
 (0)