Tweak mergify config #151
Merged
Tweak mergify config #151
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
Rebase will rebase all the commits on top of the base branch, but we don't want that. Having the merge commit is a nice indicator in the history of groups of commits that were part of a PR. By having the `strict: smart+fastpath` setting we are already guaranteeing that the PR has been updated against the base branch. See: https://doc.mergify.io/actions.html#merge and https://doc.mergify.io/merge-action.html#strict-merge
mmlb
force-pushed
the
tweak-mergify-config
branch
from
0598b33 to
12dc8b6
Compare
grahamc
previously approved these changes
Jun 4, 2020
According to the [docs][1] we can do away with a status check since github already blocks the merge when we have branch protection in place. [1]: https://doc.mergify.io/examples.html#automatic-merge-when-ci-works-and-approving-reviews
This way we ensure one set of reviews doesn't override a different set of reviews by someone else. All reviewers should have their concerns addressed before merging.
mmlb
force-pushed
the
tweak-mergify-config
branch
from
12dc8b6 to
2eccd95
Compare
grahamc
approved these changes
Jun 4, 2020
|
It required a manual merge:
|
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.
This PR will change the merge strategy back to
mergeso that we get a lovely commit object in history to have a visual grouping of commits by PR. It also minimizes the config by leaning on defaults and the branch protections already enforced by GitHub. Finally, the last commit will ensure that all reviewers feedback have been addressed and not discarded by possibly unrelated approvals.