From c1697529d266df5e5e163dd3d51f21388714be01 Mon Sep 17 00:00:00 2001
From: Daniel Donenfeld <dadonenf@microsoft.com>
Date: Tue, 26 Feb 2019 18:17:10 -0800
Subject: [PATCH] Merge all branches into APPVEYOR_REPO_BRANCH instead of
 master in case otehr development branches are used. Try checking out
 APPVEYOR_REPO_BRANCH before collecting asm

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

diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1
index 2cdfcf3..b7213b2 100644
--- a/asm/scripts/deploy-asm.ps1
+++ b/asm/scripts/deploy-asm.ps1
@@ -2,6 +2,8 @@
 . $PSScriptRoot\API-Functions.ps1
 
 function collectAsm {
+    cmd.exe /c "git checkout $($env:APPVEYOR_REPO_BRANCH) 2>&1"
+
     # Create branch to merge asm into
     git fetch --all 2>&1 
 
@@ -33,8 +35,8 @@ function collectAsm {
         }
     }
 
-    #Merge all branches into master
-    cmd.exe /c "git checkout master 2>&1"
+    #Merge all branches into $($env:APPVEYOR_REPO_BRANCH)
+    cmd.exe /c "git checkout $($env:APPVEYOR_REPO_BRANCH) 2>&1"
     cmd.exe /c "git merge --squash $($asmFinalBranch) 2>&1"
     if(-not $?){
         throw "Failed merge"