From 18dedb48386297e98f864f1220c22f534724ec30 Mon Sep 17 00:00:00 2001
From: Daniel Donenfeld <dadonenf@microsoft.com>
Date: Fri, 15 Feb 2019 19:00:15 -0800
Subject: [PATCH] throw on failed merge

---
 asm/scripts/deploy-asm.ps1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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