diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1 index ccc19be..3c1f48f 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -19,7 +19,9 @@ function collectAsm { } cmd.exe /c "git merge $($branchName) 2>&1" - + if(-not $?){ + throw "Failed merge of $($branchName)" + } } #Merge all branches into master