FAQ
Troubleshooting and FAQ
Last updated
Troubleshooting and FAQ
Last updated
Solution: Most likely you did not set up the required status checks to trigger for trunk-merge/ branches. It is also possible that your CI provider just randomly never started testing on the Trunk Merge Queue branch, even after setting the required status checks to trigger. To assist with this, you can .
First, check the Trunk web app to see what Trunk is waiting on before putting your PR into the merge queue.
Next, if something on that page doesn't look right, for example, it says that GitHub is still checking the mergeability of the PR, comment /trunk merge again in the PR.
Most likely you have a branch protection rule that is affecting Merge branches. For example, the wild card rule */* applies to trunk-merge/.... The Trunk GitHub app does not have admin privileges, so it fails to do some actions on protected branches. To resolve, you must remove this rule or reach out to Trunk on our community Slack if that is not possible.
The two most likely problems are that you are restricting who can merge, or that you have disabled squash merges into your repo. Trunk Merge Queue needs to use squash merges. To fix this turn on 'allow squash merges' for this repo in your GitHub setup.
Look for the 'Graph' tab in the UI. If you can see it then you are using the new version.
Their PRs can be manually merged, and anything currently in the merge queue will restart with those merged changes
To merge a PR in the event of an emergency, you can just merge the PR directly through GitHub as you normally would. The merge queue will restart everything it is currently testing to account for the new head of the merge branch.
We currently have other features planned to help with this, so stay tuned!
By default, both and both will rebase their PRs whenever other PRs merge into their base branch. If that rebase happens when those PRs are in the queue, they will get kicked since they were updated. There are two ways to mitigate this:
Both dependabot and renovate can be configured to not automatically rebase, while renovate can specifically be configured to only rebase if there's a merge conflict (, )