Pull before commit

.github/workflows/cgmanifest.yml

@@ -58,6 +58,8 @@ jobs:
         # Push updated cgmnaifest.json to source control
         git config --global user.email "vscr-feedback@microsoft.com"
         git config --global user.name "CI"
+        git config pull.rebase false
+        git pull "https://ci:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}" "HEAD:${{ github.ref }}"
         git add cgmanifest.json
         git commit -m 'Automated update for CG' \
           && git push "https://ci:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}" "HEAD:${{ github.ref }}" \

.github/workflows/patch.yml

@@ -51,6 +51,8 @@ jobs:
         # Add resulting status.json file back to source control
         git config --global user.email "vscr-feedback@microsoft.com"
         git config --global user.name "CI"
+        git config pull.rebase false
+        git pull "https://ci:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}" "HEAD:${{ github.ref }}"
         git add build/patch/status.json
         git commit -m 'Automated update' \
           && git push "https://ci:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}" "HEAD:${{ github.ref }}" \

.github/workflows/script-library.yml

@@ -60,7 +60,8 @@ jobs:
         build/vscdc copy-library-scripts
         git config --global user.email "vscr-feedback@microsoft.com"
         git config --global user.name "CI"
-        git pull
+        git config pull.rebase false
+        git pull "https://ci:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}" "HEAD:${{ github.ref }}"
         git add -u
         git commit -m 'Automated update for script library changes' \
           && git push "https://ci:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}" "HEAD:${{ github.ref }}" \