Define merge strategy #184
Open
Conversation
This file contains 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
Signed-off-by: Mattia Verga <mattia.verga@tiscali.it>
|
@mattiaverga wow, exactly what we need, thank you! |
|
@ahmadnassri Sorry for the ping, but could you please review this? |
|
apologies for the delay, been dealing with personal matters and have not looked at code in over a month... confident I'll land this PR this week as part of a major rewrite |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add a
strategyflag to decide how to auto-merge the PR:approve-and-mergewill mimic actual default, approve the PR and comment with the merge commandapprove-onlywill only approve the PR, so that other automatic tools (such as mergify) can merge the PR when CI tests passmerge-onlywill mimic actualapprove: falsebehavior, only post comment with the merge command without approving the PRThe default
approve-and-mergewill ensure backward compatibility with existent config files, however unexpected behavior will arise when usingstrategy: approve-and-mergetogether withapprove: false, therefore when updating the config file the use ofapproveparameter is deprecated.Fixes #176
Signed-off-by: Mattia Verga mattia.verga@tiscali.it