Skip to content

Commit 07a61c1

Browse files
Add link to devguide section on backporting in failure message (#738)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
1 parent e349557 commit 07a61c1

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

miss_islington/tasks.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@ 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+
202+
Please backport manually with [cherry_picker](https://pypi.org/project/cherry-picker/), see the [devguide](https://devguide.python.org/getting-started/git-boot-camp/#backporting-merged-changes) for more information.
202203
```
203204
cherry_picker {commit_hash} {branch}
204205
```
@@ -222,8 +223,9 @@ async def backport_task_asyncio(
222223
issue_number,
223224
f"""\
224225
Sorry {util.get_participants(created_by, merged_by)}, I had trouble completing the backport.
226+
225227
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.
228+
If that does not work, please backport manually with [cherry_picker](https://pypi.org/project/cherry-picker/), see the [devguide](https://devguide.python.org/getting-started/git-boot-camp/#backporting-merged-changes) for more information.
227229
```
228230
cherry_picker {commit_hash} {branch}
229231
```

0 commit comments

Comments
 (0)