Skip to content

Conversation

anoopcs9
Copy link
Collaborator

@anoopcs9 anoopcs9 commented Aug 5, 2025

Update and fix mergify configuration for a smoother experience.

Mergify won't merge changes due to the following error:

"The branch protection setting Require branches to be up to date
beforemerging is not compatible with max_parallel_checks>1,
queue_conditions != merge_conditions and must be unset."

Signed-off-by: Anoop C S <[email protected]>
Copy link
Collaborator

@phlogistonjohn phlogistonjohn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks!

@anoopcs9
Copy link
Collaborator Author

anoopcs9 commented Aug 8, 2025

I realized that this needs manual merging anyways since mergify configuration is modified.

@anoopcs9 anoopcs9 merged commit 3d3843a into samba-in-kubernetes:master Aug 8, 2025
12 checks passed
@anoopcs9 anoopcs9 deleted the fix-mergify-config branch August 8, 2025 06:30
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