From ab035949340ede06b7f615c24fc76e28ffa2b44f Mon Sep 17 00:00:00 2001
From: Claas Augner <495429+caugner@users.noreply.github.com>
Date: Fri, 29 Nov 2024 11:47:51 +0100
Subject: [PATCH] fix(stage-build): abort main merge on conflict (#12206)

---
 .github/workflows/stage-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
index e46f50d29432..899d3d7e6a4c 100644
--- a/.github/workflows/stage-build.yml
+++ b/.github/workflows/stage-build.yml
@@ -103,7 +103,7 @@ jobs:
           git checkout main
           git status
           git checkout -
-          git merge main --no-edit
+          git merge main --no-edit || git merge --abort
 
       - uses: actions/checkout@v4
         if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }}