From 13b3c83dc731e89d5afc49c3f0f5c9787869531e Mon Sep 17 00:00:00 2001 From: Richard Elberger Date: Wed, 17 Jun 2026 17:06:35 -0700 Subject: [PATCH] auto-backport: fix conflict_resolution to use experimental input The conflict_resolution option is nested inside the 'experimental' JSON input, not a top-level input. The previous configuration was silently ignored, causing backports with cherry-pick conflicts to be skipped entirely instead of creating draft PRs. This primarily affected wrynose-next which has older recipe versions than master-next. --- .github/workflows/auto-backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-backport.yml b/.github/workflows/auto-backport.yml index cf63c2ed1..c39d7612f 100644 --- a/.github/workflows/auto-backport.yml +++ b/.github/workflows/auto-backport.yml @@ -26,4 +26,4 @@ jobs: # copy all labels (backport labels are automatically skipped) copy_labels_pattern: .+ github_token: ${{ secrets.MAINTAINER_TOKEN }} - conflict_resolution: draft_commit_conflicts + experimental: '{"conflict_resolution": "draft_commit_conflicts"}'