ci: minor fix

Bugs5382 · Jun 29, 2024 · 80c8d21 · 80c8d21
1 parent 43ab5ce
commit 80c8d21
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.github/workflows/deploy-ci.yaml b/.github/workflows/deploy-ci.yaml
@@ -85,6 +85,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "Bugs5382"
       - name: Merge main into develop
+        continue-on-error: true
         run: |
           git remote set-url origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}
           git fetch origin