chore: merge changes #542

apigee · Sep 20, 2024 · 33f2528 · 33f2528
1 parent 9cfb5b8
commit 33f2528
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml
@@ -31,10 +31,12 @@ jobs:
         uses: actions/checkout@v4
       - name: Push GH Pages
         run: |
-          git pull origin main
+          git config pull.rebase false
           git config --global user.name "apigeecli Publish Action"
           git config --global user.email "[email protected]"
 
+          git pull origin main
+
           GOBIN=/tmp/ go install github.com/google/[email protected]
           /tmp/go-licenses csv ./cmd/apigeecli > third-party-licenses.txt || echo "Ignore warnings"
           /tmp/go-licenses save ./cmd/apigeecli --save_path=third-party --force || echo "Ignore warnings"