From 53717678b86b539e4517d93a92f41dceeb070ce3 Mon Sep 17 00:00:00 2001 From: Jie Hou Date: Sun, 18 Feb 2024 18:10:37 -0800 Subject: [PATCH] switch to rebase to avoid conflict --- .github/workflows/auto-deploy-contracts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-deploy-contracts.yaml b/.github/workflows/auto-deploy-contracts.yaml index 005aafcae..be7820d8b 100644 --- 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 pull origin ${{ github.head_ref }} --allow-unrelated-histories + run: git pull --rebase origin ${{ github.head_ref }} - name: Write deployed address to output file run: | mkdir -p deployments