ci: verify that PR does not contain merge commit #22
+12
−1
Conversation
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
guillon
force-pushed
the
dev/cguillon/ci-merge
branch
2 times, most recently
from
c4d7aa1 to
d7a78e7
Compare
guillon
force-pushed
the
dev/cguillon/ci-merge
branch
2 times, most recently
from
f1f5741 to
985e40f
Compare
qaco
approved these changes
Jan 30, 2026
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.
Motivation
Disallow merge commit for PR. This avoids in particular typical errors such as updating the branch with a merge commit from main instead of rebasing.
Description
This is a CI check, as there is no possibility to do it with github rules, inspired from solution proposed here: https://github.com/orgs/community/discussions/12032#discussioncomment-13210015
The github settings can't be set easily to forbid merge commit on the branch update button (ref there https://github.com/orgs/community/discussions/12032).
Also, anyway it would not check merge done manually by the user, hence a pre-merge check.