Ignore return code of git merge in sync workflow

multitheftauto · Sep 2, 2023 · e795e0b · e795e0b
1 parent cbd5938
commit e795e0b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/sync-master-to-maetro.yaml b/.github/workflows/sync-master-to-maetro.yaml
@@ -22,7 +22,7 @@ jobs:
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
           git checkout release/maetro
-          git merge master --no-ff --no-edit --no-commit
+          git merge master --no-ff --no-edit --no-commit || true
           
           # Discard locale conflicts
           git checkout --ours -- Shared/installer/locale "Shared/data/MTA San Andreas/MTA/locale"