Respect GitLab squash settings without squashing ucascade cascade merges#47
Open
4shurik wants to merge 1 commit intounblu:mainfrom
Open
Respect GitLab squash settings without squashing ucascade cascade merges#474shurik wants to merge 1 commit intounblu:mainfrom
4shurik wants to merge 1 commit intounblu:mainfrom
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
When the GitLab project setting
Squash commits when mergingis set toEncourage, user merge requests into release branches should still be squashed.However, ucascade cascade merges between release branches and into
mastershould remain regular merge commits. If cascade merges are squashed, the same changes can appear twice in the git graph through unrelated histories: once as a squash commit on the target branch and later again through the original mergecommit propagated by subsequent release merges.
This change makes squash behavior configurable so cascade merges can preserve graph continuity while regular user merge requests can still follow the project squash policy.