[go: up one dir, main page]

Skip to content

Provide Squash option when merging MRs

Add a checkbox "Squash into one commit" below "Merge" button of a merge request. The default state of that checkbox should be configurable per instance and per project.

The UI would ask for a commit message (defaulting to branch name) and then execute the equivalent of 'git checkout other-branch; git merge --squash this-branch; git commit -m "commit-message", close the merge request and delete the branch (if the other checkbox is ticked).

This is a common workflow in projects and not supporting it causes a lot of confusion and extra work.