Skip to content
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

Add copy-pasteable cherry-picker command if it fails to cherry-pick #44316

Merged
merged 1 commit into from
Nov 24, 2024
Merged

Add copy-pasteable cherry-picker command if it fails to cherry-pick #44316

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
18 changes: 17 additions & 1 deletion dev/backport/update_backport_status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,23 @@ def get_failure_comment(branch: str, commit_sha_url: str, commit_sha: str):
<td>{branch}</td>
<td><a href="{commit_sha_url}"><img src='{commit_shield_url}' alt='Commit Link'></a></td>
</tr>
</table>"""
</table>

You can attempt to backport this manually by running:

```bash
cherry_picker {commit_sha[:7]} {branch}
```

This should apply the commit to the {branch} branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

```bash
cherry_picker --continue
```
"""
return comment


Expand Down
Loading