From 5afeb81bf95b92565b87ca507842a94ef887bcde Mon Sep 17 00:00:00 2001
From: Daniel Donenfeld <dadonenf@microsoft.com>
Date: Thu, 14 Feb 2019 15:48:27 -0800
Subject: [PATCH] Add logging of branches. Throw on merge

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

diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1
index 1b879c8..1ce238f 100644
--- a/asm/scripts/deploy-asm.ps1
+++ b/asm/scripts/deploy-asm.ps1
@@ -120,7 +120,11 @@ function collectAsm {
     $branchString = $asmBranches -join ' '
     git checkout master
     git pull
+    git branch -a
     git merge --squash $branchString
+    if(-not $?){
+        throw "Failed merge"
+    }
     git diff-index --cached --quiet --exit-code HEAD
     if(-not $?) {
         git commit -m "[skip ci] Update ASM for $($env:APPVEYOR_REPO_COMMIT)"