-
Notifications
You must be signed in to change notification settings - Fork 138
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
Enable auto merge using Mergify on approval #148
Conversation
Signed-off-by: Gaurav Gahlot <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we probably want these two minor changes to behavior. Note if rebase fails, it'll fall back to merge -- which I think is okay.
.mergify.yml
Outdated
- status-success=CI / build | ||
actions: | ||
merge: | ||
method: squash |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we probably want to use the rebase
method, which should automatically fall back to merge if rebase fails.
method: squash | |
method: rebase |
.mergify.yml
Outdated
merge: | ||
method: squash | ||
commit_message: title+body | ||
strict: smart |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
strict: smart | |
strict: smart+fastpath |
Signed-off-by: Gaurav Gahlot <[email protected]>
Enable auto-merge using Mergify on approval.
Workflow:
ready-to-merge
labelhold-off-merging
label is setSigned-off-by: Gaurav Gahlot [email protected]