fix: merge before pushing to remote

apify · Sep 5, 2022 · c96b9b8 · c96b9b8
1 parent 3be6408
commit c96b9b8
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.github/workflows/sync_branches.yaml b/.github/workflows/sync_branches.yaml
@@ -28,6 +28,7 @@ jobs:
           cd repo
           git clone https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git .
           git switch ${{ github.base_ref }}
+          git merge ${{ inputs.baseBranch }} --no-edit
           git push https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git ${{ github.base_ref }}:${{ inputs.baseBranch }}
 
       - name: report failure to slack