From 562c2e251ab2bda8aa1dd57824aba9c070f8b5d4 Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Thu, 4 Feb 2021 08:38:42 -0800
Subject: [PATCH] Pull before commit

---
 .github/workflows/cgmanifest.yml     | 2 ++
 .github/workflows/patch.yml          | 2 ++
 .github/workflows/script-library.yml | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cgmanifest.yml b/.github/workflows/cgmanifest.yml
index 7a507129..b6077441 100644
--- a/.github/workflows/cgmanifest.yml
+++ b/.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 }}" \
diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml
index f84e6b14..36e4d279 100644
--- a/.github/workflows/patch.yml
+++ b/.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 }}" \
diff --git a/.github/workflows/script-library.yml b/.github/workflows/script-library.yml
index 0bf8a827..3d3639ae 100644
--- a/.github/workflows/script-library.yml
+++ b/.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 }}" \