You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
At the moment, when one of the following options are enabled in the GitLab project settings:
...Marge-bot is unable to handle the MR. This is the error generated:
I couldn't merge this branch: Sorry, merging requests marked as auto-squash would ruin my commit tagging!
The main reason why we have Encourage squash enabled is to avoid meaningless "Applied n suggestions" commits slipping into our master branch. With the Encourage squash setting, we can retain a cleaner commit history. (We use a rebase-based workflow with no merge commits in the master branch.)
Now, it is of course possible to uncheck the Squash commits when merge request is accepted setting for an MR before assigning it to the Marge-bot used, but naturally, this significantly hampers the usefulness of Marge-bot unfortunately.
So my question would be:
Are there any ways around this with the current version of Marge-bot as it stands?
If not, are there any plans to make this possible sometime in the reasonably near future?
At the moment, when one of the following options are enabled in the GitLab project settings:
...Marge-bot is unable to handle the MR. This is the error generated:
The main reason why we have
Encourage squash
enabled is to avoid meaningless "Applied n suggestions" commits slipping into ourmaster
branch. With theEncourage squash
setting, we can retain a cleaner commit history. (We use a rebase-based workflow with no merge commits in themaster
branch.)Now, it is of course possible to uncheck the
Squash commits when merge request is accepted
setting for an MR before assigning it to the Marge-bot used, but naturally, this significantly hampers the usefulness of Marge-bot unfortunately.So my question would be:
Semi-related issue: #152
The text was updated successfully, but these errors were encountered: