diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1 index 14a422d..32ac8f4 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -133,6 +133,7 @@ function collectAsm { $branchString = $asmBranches -join ' ' git checkout master git pull + git fetch origin git branch -a Write-Host "git merge --squash $($branchString)" git merge --squash $branchString