diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1 index cc352bc..75f9aae 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -19,7 +19,7 @@ function collectAsm { } # Use cherry-pick as the asm branches only have a single commit - cmd.exe /c "git cherry-pick origin/$($branchName) 2>&1" + cmd.exe /c "git cherry-pick origin/$($branchName) --allow-empty 2>&1" if(-not $?){ throw "Failed merge of $($branchName)" }