Skip to content

Conversation

lbhsos
Copy link

@lbhsos lbhsos commented Aug 31, 2025

Description

This PR introduces a new GitHub Actions workflow, Backport Conflict Check.
The workflow automatically verifies whether a pull request can be cleanly cherry-picked into a branch labeled with a backport <version> tag.

Key features:

  • Detects backport <version> label on PR.
  • Fetches the corresponding upstream target branch.
  • Attempts git cherry-pick of the PR’s head commit.
  • Reports conflicts back to the PR as a comment when detected.

Related Issues

Resolves #12097

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@lbhsos lbhsos requested review from a team, jed326 and peternied as code owners August 31, 2025 11:43
@github-actions github-actions bot added Build Build Tasks/Gradle Plugin, groovy scripts, build tools, Javadoc enforcement. enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers labels Aug 31, 2025
@lbhsos lbhsos changed the title ci: Add workflow to detect backport conflicts before merging Add workflow to detect backport conflicts before merging Aug 31, 2025
@cwperks
Copy link
Member

cwperks commented Sep 2, 2025

@lbhsos interesting PR :). Did you test this on your fork? I'd be curious to see an example comment that it leaves on a PR.

Can you also please fix the DCO check by signing off on your commits? git commit -m "message here" --signoff

@lbhsos
Copy link
Author

lbhsos commented Sep 7, 2025

@cwperks
Yes, here's my test on my fork.
I've also fixed the DCO check. Thank you for the heads-up!

@opensearch-trigger-bot
Copy link
Contributor

This PR is stalled because it has been open for 30 days with no activity.

@opensearch-trigger-bot opensearch-trigger-bot bot added the stalled Issues that have stalled label Oct 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Build Build Tasks/Gradle Plugin, groovy scripts, build tools, Javadoc enforcement. enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers stalled Issues that have stalled

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature Request] Show backport conflicts pre-merge on PRs

2 participants