throw on failed merge

2025-02-22 01:12:53 -05:00 · 2019-02-15 19:00:15 -08:00 · 2019-02-15 19:00:15 -08:00 · 18dedb4838
commit 18dedb4838
parent 7e72576ace
1 changed files with 3 additions and 1 deletions
--- 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