fix(stage-build): abort main merge on conflict (#12206)

mdn · Nov 29, 2024 · ab03594 · ab03594
1 parent 08313d5
commit ab03594
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 }}