From 9a441ab3ad67fe286337acdae163da4e5fed8ceb Mon Sep 17 00:00:00 2001
From: Florian Heilmann <Florian.Heilmann@gmx.net>
Date: Thu, 29 Feb 2024 19:29:06 +0100
Subject: [PATCH] Remove continue-on-error for regular merge attempt

[skip ci]
---
 .github/workflows/merge_main.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/merge_main.yml b/.github/workflows/merge_main.yml
index d7e34a40..54d81e76 100644
--- a/.github/workflows/merge_main.yml
+++ b/.github/workflows/merge_main.yml
@@ -27,7 +27,6 @@ jobs:
           fetch-depth: 0
       - name: Regular merge attempt
         if: ${{ github.event.inputs.force == 'false' }}
-        continue-on-error: true
         run: |
           git checkout ${{ inputs.targetBranch }}
           git merge main --ff-only