Skip to content

Add link to devguide section on backporting in failure message #738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
StanFromIreland wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add link to devguide section on backporting in failure message #738

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions miss_islington/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
```
Expand All @@ -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}
```
Expand Down