[go: up one dir, main page]

Skip to content

Override squash settings with option to specify different overrides based on the source branch

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

Merge Request Squash Settings per protected bra... (#290042 - closed) implements the ability to define squash commit when merging overrides for a protected branch. This allows the user to define what happens when we merge into the protected branch. However, the issue also describes a situation where a protected branch should have different overrides based on which branch is being merged into the protected branch

  • I need to be able to merge between protected branches (even though I require squash from non-protected to protected branches) - which is a possibly-separate requirement captured in #24452
    • because squashing between protected branches almost never makes sense (and merges between protected branches are a common thing in eg gitflow). the only time we should require squashing, is when merging from a non-protected branch to a protected branch

When the original issue has been implemented we might want to iterate and add a new mechanism to give even finer control

Edited by 🤖 GitLab Bot 🤖