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.

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

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

Open
andrross opened this issue Jan 30, 2024 · 1 comment
Open

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

andrross opened this issue Jan 30, 2024 · 1 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

Comments

@andrross
Copy link
Member

andrross commented Jan 30, 2024

Is your feature request related to a problem? Please describe

The backport automation, when it works, greatly reduces the manual effort to maintain other branches. However, sometimes it fails but we don't get any indication that it will fail until after the PR on main is committed. I think it would be nice to know ahead of time if my PR will generate a conflict on backport, and to know which files will conflict. This gives me an opportunity to fix it ahead of time if possible. (The usual avoidable conflicts are due to an incorrect CHANGELOG entry, but this still strikes me as being potentially useful even if we improve the CHANGELOG process to avoid contention on a single file)

Describe the solution you'd like

If I add a backport 2.x label to my PR, then a GitHub action is run that tells me either one of the following:

  • My commit will cleanly backport to the 2.x branch
  • My commit will not cleanly backport, and which files have conflicts that must be manually resolved

Related component

Build

@andrross andrross added enhancement Enhancement or improvement to existing feature or request untriaged labels Jan 30, 2024
@github-actions github-actions bot added the Build Build Tasks/Gradle Plugin, groovy scripts, build tools, Javadoc enforcement. label Jan 30, 2024
@peternied
Copy link
Member

[Triage - attendees 1 2 3 4 5 6 7 8]
@andrross Thanks for filing this issue, this would be useful for contributors authoring pull requests

@andrross andrross added the good first issue Good for newcomers label Jan 31, 2024
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
Projects
None yet
Development

No branches or pull requests

3 participants
@peternied @andrross and others