test

consensus-shipyard · Feb 18, 2024 · 13c1bb4 · 13c1bb4
1 parent 8b6c905
commit 13c1bb4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/auto-deploy-contracts.yaml b/.github/workflows/auto-deploy-contracts.yaml
@@ -69,7 +69,7 @@ jobs:
           ref: cd/contracts
           submodules: recursive
       - name: Merge from the branch that triggered the workflow run
-        run: git merge origin/${{ github.head_ref }}
+        run: git pull origin ${{ github.head_ref }} --allow-unrelated-histories
       - name: Write deployed address to output file
         run: |
           mkdir -p deployments