Skip to content

Commit

Permalink
Add copy-pasteable cherry-picker command if it fails to cherry-pick (#…
Browse files Browse the repository at this point in the history
…44316)

When cherry-picker fails to backport a PR it adds a message to
the PR explaining the failure and linking to the commit. This PR
also adds a copy&pasteable cherry-picker command that the maintainer
should run to retry it locally. It also explains what
maintainer should do after solving the conflicts.
  • Loading branch information
potiuk authored Nov 24, 2024
1 parent ab72e94 commit 49c6067
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion dev/backport/update_backport_status.py
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

0 comments on commit 49c6067

Please sign in to comment.