add command that helps with backporting commit to multiple branches #44
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: zmiklank The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
do-not-merge/work-in-progress
plugins/git/commands/backport.md
Outdated
| @@ -0,0 +1,63 @@ | |||
| You are helping backport a commit to multiple branches. | |||
|
|
|||
| # Arguments | |||
There was a problem hiding this comment.
please follow ## conventions in the ref implementation https://github.com/openshift-eng/ai-helpers?tab=readme-ov-file#plugin-development
There was a problem hiding this comment.
Hi @enxebre thanks for looking into this!
I have updated the file based on your feedback.
Signed-off-by: Zuzana Miklankova <[email protected]> Co-Authored-By: Claude <[email protected]>
zmiklank
force-pushed
the
backports_command
branch
from
59c17ae to
d40de43
Compare
| - Pulls latest changes to ensure it's up to date: `git pull` | ||
| - **If the branch doesn't track a remote branch:** | ||
| - Skips pulling and informs the user the branch is local-only | ||
| - **If `--new-branch` flag is set:** |
There was a problem hiding this comment.
why is --new-branch an opt-in flag instead of default builtin behaviour? when wouldn't I want it to create a new branch if it doesn't exist yet?
There was a problem hiding this comment.
For example if you would want to cherry pick second commit to the same branch.
There was a problem hiding this comment.
sorry, I'm not following. Every time you want to cherrypick a specific commit the command would just reuse/create a local branch named backport-<commit-short-hash>-to-<branch> as builtin behaviour. In that workflow how is an opt-in flag helpful? do you have a concrete workflow example?
2 participants
What this PR does / why we need it:
It adds command that helps with backporting commit to multiple branches