Skip to content

Add cherry-pick workflow in Github Action#15226

Merged
vineethkuttan merged 1 commit intomicrosoft:mainfrom
vineethkuttan:cherryPickAction
Oct 13, 2025
Merged

Add cherry-pick workflow in Github Action#15226
vineethkuttan merged 1 commit intomicrosoft:mainfrom
vineethkuttan:cherryPickAction

Conversation

@vineethkuttan
Copy link
Copy Markdown
Contributor

@vineethkuttan vineethkuttan commented Oct 10, 2025

Description

Cherry-picks a specific commit into a target branch.

Type of Change

  • Automation (AI changes or Github Actions to reduce effort of manual tasks)

Why

This change introduces a GitHub Actions workflow to automate cherry-picking commits from one branch to another. It simplifies manual effort and reduces the risk of human error during repetitive cherry-pick operations.

What

  1. Go to the Actions tab in the GitHub repository
  2. Select "Cherry-pick Commit to Branch" workflow
  3. Click "Run workflow"
  4. Enter the required inputs:
    • Commit SHA or ID: The full commit hash or short SHA of the commit to cherry-pick
    • Target branch name: The branch where you want to cherry-pick the commit

Screenshots

cherry-pick.mp4

Should this change be included in the release notes: no

Add a brief summary of the change to use in the release notes for the next release.

Microsoft Reviewers: Open in CodeFlow

@vineethkuttan vineethkuttan marked this pull request as ready for review October 10, 2025 05:24
@vineethkuttan vineethkuttan requested review from a team as code owners October 10, 2025 05:24
@HariniMalothu17
Copy link
Copy Markdown
Contributor

https://docs.github.com/en/desktop/managing-commits/cherry-picking-a-commit-in-github-desktop
We already have similar actions for cherry picking right?

@vineethkuttan
Copy link
Copy Markdown
Contributor Author

vineethkuttan commented Oct 12, 2025

https://docs.github.com/en/desktop/managing-commits/cherry-picking-a-commit-in-github-desktop We already have similar actions for cherry picking right?

Ah, I see! This is using GitHub Desktop. What I'm trying to do is cherry-pick a commit remotely.
The idea is that GitLab has a feature where you can cherry-pick a commit to any branch directly from the Web UI. I’ve tried to replicate that functionality using a GitHub Action.
Reference

@vineethkuttan vineethkuttan self-assigned this Oct 13, 2025
@anupriya13
Copy link
Copy Markdown
Contributor

Looks good, but in future let's see if we can automate conflict resolution using copilot agent workflows

@vineethkuttan vineethkuttan merged commit 64ef874 into microsoft:main Oct 13, 2025
58 checks passed
@vineethkuttan vineethkuttan deleted the cherryPickAction branch October 13, 2025 09:04
github-actions Bot pushed a commit that referenced this pull request Oct 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants