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

Support configuring merge strategy for automerge option #1692

Open
dannysauer opened this issue Sep 4, 2024 · 1 comment
Open

Support configuring merge strategy for automerge option #1692

dannysauer opened this issue Sep 4, 2024 · 1 comment

Comments

@dannysauer
Copy link
Contributor

The digger config file allows setting auto_merge: true, but does not have a setting to configure whether that happens using merge, squash, or rebase. This results in potentially unexpected behavior if a repository allows for multiple methods. In the case of merge and squash, it might also be useful to allow configuring the commit message (or at least the method used to generate the commit message) - but expecting the repo admin to configure the default message in Github's settings (I forget how Gitlab handles that) is probably enough.

This Mergify blog post has a lot of good links. The Github blog post is probably enough information for Github, though.

@goedelsoup-clari
Copy link

Running into this in a CDKTF TypeScript monorepo; if I have changes to CDK stacks as well as applications in the same PR then my auto-versioning via conventional commits is broken because Digger not only squashes, but overrides the commit body with auto-merge.

Users can configure the default squash format on the repo level and passing an empty string to the API for commit message will cause the default format to be used.

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