Post comment advising squash merge if merge commits are found#609
Open
jponge wants to merge 1 commit intoquarkusio:mainfrom
Open
Post comment advising squash merge if merge commits are found#609jponge wants to merge 1 commit intoquarkusio:mainfrom
jponge wants to merge 1 commit intoquarkusio:mainfrom
Conversation
This still reports a failing check when a PR branch contains merge commits, but it reminds maintainers about the possibility to use a squashed commit merge if the repository and branch protection rules allow it.
jponge
force-pushed
the
feat/comment-about-squash-merges
branch
from
3ff9d93 to
efafe4c
Compare
Member
|
Squash and merge is not available when doing merge commits IIRC. Has it changed? |
Member
|
Also, I would prefer a clean history before merging, and that people make sure the history makes sense. |
Member
Author
|
No, we can only do classic merges, squash and merge is not enabled on Quarkus. But if we were to relax this, the bot could help to warn that while this is not what we want, we can do a squashed merge to enforce a clean history. I won't push for this to be merged, just know that we could be more lenient. |
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.
This still reports a failing check when a PR branch contains merge commits, but it reminds maintainers about the possibility to use a squashed commit merge if the repository and branch protection rules allow it.