From d8b8742592ba9b9291311e3929578acbefb7ba13 Mon Sep 17 00:00:00 2001
From: Nico Korthout <nicokorthout@gmail.com>
Date: Fri, 10 May 2024 17:24:37 +0200
Subject: [PATCH] test: set conflict_resolution draft_commit_conflicts

---
 .github/workflows/backport-comment.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/backport-comment.yml b/.github/workflows/backport-comment.yml
index 78d6fe9..16b1dea 100644
--- a/.github/workflows/backport-comment.yml
+++ b/.github/workflows/backport-comment.yml
@@ -31,7 +31,8 @@ jobs:
           copy_requested_reviewers: true
           experimental: >
             {
-              "detect_merge_method": true
+              "detect_merge_method": true,
+              "conflict_resolution": "draft_commit_conflicts"
             }
       - name: Print was_successful output
         run: echo "${{ steps.backport.outputs.was_successful }}"