-
Notifications
You must be signed in to change notification settings - Fork 58
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
Backport GH action & merge conflicts #447
Comments
This sounds like a good enhancement. I'll look into it. |
The fact that the github action is successful but the PR isn't created due to a merge conflict is a bug IMO, not a feature request. I was very surprised to find that this has been reported and not resolved after such a long time. Rather than a config, I believe this should be standard behavior. Right now devs in my team complain about missing backport PRs and you need to dig into the github action logs to find out what the actual issue is. This could mean that a backport could be forgotten which is very bad. |
For anyone reading, setting |
Tested with:
Merge conflict => Fix locally before it is pushed & PR created
Merge conflict
=> Creates a PR for the branches that have no merge conflicts.
=> Merge conflict reported in the log
=> Merge conflicts are not reported on higher level, for examply failed/warning on GH action.
What I'm asking:
Can there maybe be a config option to force cherry-pick & push and let the merge conflict be handled by Github in the pull request?
For example:
I would build a Github check on PR, to check for "<<<<<<< HEAD".
People can then checkout the PR branch, do some fixes, push and merge the PR.
Maybe mostly useful for the Github Action route, but still usefull in my opinion. Would you be open to a change like this?
The text was updated successfully, but these errors were encountered: