From 5cbcb0ff7bffbe0833413a1b15bfc7d5f3d82e97 Mon Sep 17 00:00:00 2001
From: Yonas Habteab <yonas.habteab@icinga.com>
Date: Wed, 21 Jan 2026 14:03:34 +0100
Subject: [PATCH] backbot: drop `conflict_resolution` option

---
 .github/workflows/backbot.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/backbot.yml b/.github/workflows/backbot.yml
index e46438ac2..62f6677b1 100644
--- a/.github/workflows/backbot.yml
+++ b/.github/workflows/backbot.yml
@@ -49,7 +49,6 @@ jobs:
           github_token: ${{ steps.backbot-token.outputs.token }}
           copy_labels_pattern: '^(?!cla\/signed$).*' # copy all labels other than the cla/signed label
           label_pattern: 'backport-to-(support\/\d+\.\d+)' # regex to match labels like backport-to-support/2.14
-          conflict_resolution: 'draft_commit_conflicts' # create a draft PR if there are conflicts
           merge_commits: skip # skip merge commits found in the original PR history
           pull_description: |-
             Backport of #${pull_number} to `${target_branch}`, triggered by a label.