Skip to content

Respect GitLab squash settings without squashing ucascade cascade merges - #47

Open
4shurik wants to merge 1 commit into
unblu:mainfrom
4shurik:feature-HLD-7835
Open

Respect GitLab squash settings without squashing ucascade cascade merges#47
4shurik wants to merge 1 commit into
unblu:mainfrom
4shurik:feature-HLD-7835

Conversation

@4shurik

@4shurik 4shurik commented Apr 9, 2026

Copy link
Copy Markdown

When the GitLab project setting Squash commits when merging is set to Encourage, user merge requests into release branches should still be squashed.

However, ucascade cascade merges between release branches and into master should 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 merge
commit 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.

@4shurik
4shurik marked this pull request as ready for review April 10, 2026 14:17
@gysel
gysel requested review from fbpe and jmini April 11, 2026 19:31
@4shurik

4shurik commented Jul 9, 2026

Copy link
Copy Markdown
Author

Hi @jmini @fbpe @gysel 👋

Gentle nudge on this one — it's been open since April, so I just wanted to make sure it hasn't slipped off the radar.

Quick recap: the change makes ucascade respect GitLab's "Squash commits when merging" setting for regular MRs, while keeping the automated cascade merges between release branches (and into master) as plain merge commits — so the history doesn't end up with duplicated changes.

It's a single, self-contained commit, and I'm happy to rebase or address any feedback whenever it's convenient for you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant