From 524a4140ee2ed87fb984b22274563dfba33c019d Mon Sep 17 00:00:00 2001 From: Cal Bera Date: Thu, 14 Aug 2025 12:40:39 -0700 Subject: [PATCH] fix(actions): resolve backport warning (#66) --- .github/workflows/backport.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 15facd5924..6a5fdc9f5d 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -121,10 +121,11 @@ jobs: # Add original PR author as assignee add_author_as_assignee: true - # What to do when there are conflicts - # Options: "fail" or "draft_commit_conflicts" - # Using draft_commit_conflicts so conflicts don't block the process - conflicts_strategy: "draft_commit_conflicts" + # Enable experimental features (includes conflict handling) + experimental: | + { + "detect_merge_method": true + } # Cherry-picking strategy # Options: "auto", "recursive", "ort"