Make auto-merge more conservative#2204
Merged
thomas-zahner merged 1 commit intoMay 28, 2026
Merged
Conversation
katrinafyi
reviewed
May 21, 2026
katrinafyi
left a comment
Member
There was a problem hiding this comment.
I might be mistaken, but I believe each run step uses its own shell so an early exit 0 won't stop the next step from running?
936806d to
3e5edec
Compare
Member
Author
|
@katrinafyi Oh, thank you, I think you are totally right. It would have to exit with a non-zero code, which is what I did first. But then I realised that the action should probably not fail. Using an Btw, renovate bot would apparently handle such cases. So we could think about replacing dependabot with renovate bot. But I thought to keep the changes minimal for now. |
Only do auto-merges when the pull-request contains exactly one commit author. This prevents pull-requests which are manually amended from being merged automatically.
3e5edec to
3b49f10
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Only do auto-merges when the pull-request contains exactly one commit author. This prevents pull-requests which are manually amended from being merged automatically.
This prevents me and others from redoing the mistake done in #2199 (comment)