Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature request: Make it possible to use marge-bot with Encourage/Require squash commits when merging #333

Open
perlun opened this issue Jan 21, 2022 · 1 comment

Comments

@perlun
Copy link

perlun commented Jan 21, 2022

At the moment, when one of the following options are enabled in the GitLab project settings:

image

...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:

  1. Are there any ways around this with the current version of Marge-bot as it stands?
  2. If not, are there any plans to make this possible sometime in the reasonably near future?

Semi-related issue: #152

@insider89
Copy link

Does it plan to be implemented in the near future?

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

No branches or pull requests

2 participants