From 1ab47d2f06f4f964a5d8908d312d06203014c38f Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Wed, 28 Dec 2022 16:09:20 +1000 Subject: [PATCH] pipeline file changes --- .azure/pipelines/azure-pipelines-deploy.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.azure/pipelines/azure-pipelines-deploy.yml b/.azure/pipelines/azure-pipelines-deploy.yml index 58cf9c45..fe5f3b27 100644 --- a/.azure/pipelines/azure-pipelines-deploy.yml +++ b/.azure/pipelines/azure-pipelines-deploy.yml @@ -76,10 +76,13 @@ stages: Write-Host "Performing Git Checkout" git checkout -b master + Write-Host "Performing Git Fetch" + git fetch + Write-Host "Performing Git Branch" git branch --set-upstream-to=origin/master master - Write-Host "Performing a Git Pull" + Write-Host "Performing Git Pull" git pull --force pwsh: true workingDirectory: '$(Build.SourcesDirectory)' @@ -141,8 +144,8 @@ stages: git config --global user.email "${{parameters.GitEmail}}" git config --global user.name "${{parameters.GitUsername}}" - Write-Host "Setting up the configuration" - git config pull.rebase false + #Write-Host "Setting up the configuration" + #git config pull.rebase false #Write-Host "Performing Git Checkout" #git checkout -b master