Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d96e3c1

Browse filesBrowse files
authored
Mention which branch has merge conflict and has to be backported manually (GH-14)
1 parent ee4fb87 commit d96e3c1
Copy full SHA for d96e3c1

File tree

Expand file treeCollapse file tree

1 file changed

+3
-3
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+3
-3
lines changed

‎backport/tasks.py

Copy file name to clipboardExpand all lines: backport/tasks.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ def backport_task(commit_hash, branch, *, issue_number, created_by, merged_by):
3737
cp.backport()
3838
except cherry_picker.BranchCheckoutException:
3939
util.comment_on_pr(issue_number,
40-
f"Sorry @{created_by} and @{merged_by}, I had trouble checking out the backport branch."
41-
"Please backport using [cherry_picker](https://pypi.org/project/cherry-picker/) on command line.")
40+
f"""Sorry @{created_by} and @{merged_by}, I had trouble checking out the `{branch}` backport branch.
41+
Please backport using [cherry_picker](https://pypi.org/project/cherry-picker/) on command line.""")
4242
cp.abort_cherry_pick()
4343
except cherry_picker.CherryPickException:
4444
util.comment_on_pr(issue_number,
45-
f"""Sorry, @{created_by} and @{merged_by}, I could not cleanly backport this PR due to a conflict.
45+
f"""Sorry, @{created_by} and @{merged_by}, I could not cleanly backport this to `{branch}` due to a conflict.
4646
Please backport using [cherry_picker](https://pypi.org/project/cherry-picker/) on command line.""")
4747
cp.abort_cherry_pick()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.