Try out setting strict_method: rebase
#156
Merged
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
This will have mergify rebase the PR on top of master instead of merging master into the PR. The reason for this is to help keep history neater. Merging master into the PR isn't too bad if the PR was relatively short and started recently, but gets to be pretty bad the longer it lives or the earlier it branched off of master. The only real down side to this in our use case is that upon rebasing, Mergify impersonates one of the repository members when doing the rebase, so the history will reflect that as "commiter". I've chatted with Mergify and this is actually on their roadmap and of high priority so :fingers_crossed:.
grahamc
approved these changes
Jun 4, 2020
|
Right. It edits the config, so mergify won't merge it. |
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 will have mergify rebase the PR on top of master instead of merging
master into the PR. The reason for this is to help keep history neater.
Merging master into the PR isn't too bad if the PR was relatively short
and started recently, but gets to be pretty bad the longer it lives or
the earlier it branched off of master.
The only real down side to this in our use case is that upon rebasing,
Mergify impersonates one of the repository members when doing the
rebase, so the history will reflect that as "commiter". I've chatted
with Mergify and this is actually on their roadmap and of high priority
so :fingers_crossed:.