diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1 index 3c1f48f..a2ed930 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -18,7 +18,8 @@ function collectAsm { throw "Missing branch for job $($_.jobId)" } - cmd.exe /c "git merge $($branchName) 2>&1" + # Use cherry-pick as the asm branches only have a single commit + cmd.exe /c "git cherry-pick $($branchName) 2>&1" if(-not $?){ throw "Failed merge of $($branchName)" }