From b58a3b4feb4d27bc9dcb40c39c2f74d61452b789 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 6 Jun 2026 12:05:58 +0000 Subject: [PATCH] docs(merge-queue): config issues panel and troubleshooting update Adds changelog entry and troubleshooting section for the new Issues tab in the Merge Queue dashboard, which surfaces detected ruleset config problems with plain-language explanations and remediation links. Source: trunk-io/trunk2#4090 Co-Authored-By: Claude --- ...-06-05-merge-queue-config-issues-panel.mdx | 23 +++++++++++++++++++ docs.json | 1 + merge-queue/reference/troubleshooting.mdx | 8 +++++++ 3 files changed, 32 insertions(+) create mode 100644 changelog/2026-06-05-merge-queue-config-issues-panel.mdx diff --git a/changelog/2026-06-05-merge-queue-config-issues-panel.mdx b/changelog/2026-06-05-merge-queue-config-issues-panel.mdx new file mode 100644 index 00000000..5e82bace --- /dev/null +++ b/changelog/2026-06-05-merge-queue-config-issues-panel.mdx @@ -0,0 +1,23 @@ +--- +title: "Merge Queue: Configuration Issues Panel" +description: "The Merge Queue dashboard now surfaces detected ruleset configuration problems in a dedicated Issues tab, with plain-language explanations and links to the affected settings." +date: 2026-06-05 +category: Merge Queue +type: new-feature +--- + +**The Merge Queue dashboard now shows a dedicated Issues tab when Trunk detects configuration problems on your merge instance.** + +When a ruleset or merge-instance setting is misconfigured in a way that will cause PRs to fail or behave unexpectedly, an **Issues** tab appears in the Merge Queue navigation. Each issue card explains the specific problem, why it matters, and what to change to fix it, with direct links to the affected ruleset and relevant docs. + +Issues are grouped by impact category: + +- **Enqueue** — configuration that prevents PRs from entering the queue correctly +- **Test** — configuration that affects how testing branches are created or validated +- **Merge** — configuration that interferes with the final merge step + +Each issue displays the severity level (warning or error) and the name of the ruleset involved, so you can act on it without hunting through your GitHub settings. + +One example check: if Trunk Merge is on the bypass list for a ruleset that enforces required reviews or status checks, it appears as a warning. Trunk relies on GitHub to enforce those gates before a PR enters the queue — bypassing them makes PRs mergeable before they are ready. + +The Issues tab only appears when problems exist. Merge instances with no detected issues show no Issues tab. diff --git a/docs.json b/docs.json index 47162ba5..e1a85a25 100644 --- a/docs.json +++ b/docs.json @@ -618,6 +618,7 @@ { "group": "June", "pages": [ + "changelog/2026-06-05-merge-queue-config-issues-panel", "changelog/2026-06-04-merge-queue-chrome-extension-0-8-0" ] }, diff --git a/merge-queue/reference/troubleshooting.mdx b/merge-queue/reference/troubleshooting.mdx index 12749456..cd8fb546 100644 --- a/merge-queue/reference/troubleshooting.mdx +++ b/merge-queue/reference/troubleshooting.mdx @@ -4,6 +4,14 @@ description: "Common Trunk Merge Queue issues and how to fix them, including per og:title: "Troubleshooting Trunk Merge Queue" --- +## Configuration issues panel + +When Trunk detects a ruleset or merge-instance setting that will cause PRs to fail or behave unexpectedly, an **Issues** tab appears in the Merge Queue navigation. Each issue card names the affected ruleset, explains the problem, and tells you what to change. The tab only appears when problems exist. + +Common issues detected: + +- **Trunk on bypass list for a rules-enforcement ruleset.** If Trunk Merge is on the bypass list for a ruleset that enforces required reviews or status checks, PRs can enter the queue before those gates are satisfied. Remove Trunk from the bypass list; Trunk only needs bypass permission for branch update and push protection rules. + ## If your test PR doesn't merge automatically