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

fix: auto merge not running when there's no conflicts #473

Merged

Conversation

nicklasmoeller
Copy link
Contributor

Hey 👋

Thank you for the great tool - highly appreciated!

I just bumped our Github Actions version, and quickly figured out that auto merging isn't working for us anymore. I tried figuring out what was going on, and we don't have any Auto merge:. I found this, and it seems like the logic is incorrect here.

Disclaimer: I haven't tested this, but it looks fairly trivial.

@sorenlouv sorenlouv enabled auto-merge (squash) August 30, 2023 07:51
@sorenlouv
Copy link
Owner

Good catch and thanks for the contribution! I'll merge this shortly and will release a new version.

@sorenlouv sorenlouv disabled auto-merge August 30, 2023 07:53
@sorenlouv sorenlouv enabled auto-merge (squash) August 30, 2023 07:53
@sorenlouv sorenlouv disabled auto-merge August 30, 2023 07:54
@sorenlouv sorenlouv merged commit 02335b0 into sorenlouv:main Aug 30, 2023
@nicklasmoeller
Copy link
Contributor Author

Thank you! Confirmed working on my end now 👏

@nicklasmoeller nicklasmoeller deleted the fix/auto-merge-only-without-conflicts branch August 30, 2023 10:19
@sorenlouv
Copy link
Owner

Good to hear, thanks!

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

Successfully merging this pull request may close these issues.

2 participants