Disallow plain 'merge' command when deployments are enabled #301
+99
−3
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
Riscky
force-pushed
the
riscky/always-deploy
branch
from
dc41d7b to
4368b61
Compare
maartenberg
reviewed
Jan 27, 2026
Member
maartenberg
left a comment
maartenberg
left a comment
There was a problem hiding this comment.
Code LGTM! I have one usability/DevEx concern:
Comment on lines
+253
to
+254
| pMergeWithoutDeploy :: Parser ApprovedFor | ||
| pMergeWithoutDeploy = P.try (pSpace1 *> P.string' "without" *> (MergeWithoutDeploy <$ (pSpace1 *> P.string' "deploying"))) |
Member
There was a problem hiding this comment.
Can we allow both "merge without deploy" and "merge without deploying" here? I think this would prevent some confusion/irritation, since the normal command is "merge and deploy".
If this isn't easily possible it might be better to make the command "merge without deploying" for consistency with "merge and deploy".
Author
There was a problem hiding this comment.
Agreed, I suspect that should be easy with the parser
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.
refs #292
This adds a
allowPlainMergesetting to the project settings, which defaults to True (the current behavior). If set to False, plainmergecommands are not allowed anymore, and insteadmerge without deployinghas to be issued for a merge to go through without tagging or deploying.