From 4c3bfab717f71df74f9f4ce80e63292951b5c6e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Thu, 16 Apr 2026 08:48:47 +0200 Subject: [PATCH] Fix dependabot auto-merge to work with merge queues The workflow was calling 'gh pr merge' without the '--auto' flag, which tried to set an explicit merge method. When a merge queue is configured, it controls the merge strategy, causing a conflict. Changed to use 'gh pr merge --auto' to properly enable auto-merge without specifying a merge method, allowing the merge queue to add the PR once all requirements are met. --- .github/workflows/dependabot-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index d2dbad8..52ce1bc 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -21,7 +21,7 @@ jobs: steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch' run: | - gh pr merge "$PR_URL" + gh pr merge "$PR_URL" --auto gh pr comment "$PR_URL" --body "✅ Auto-merge enabled. This PR will merge automatically / added to merge queue, once all checks pass." env: PR_URL: ${{ github.event.pull_request.html_url }}