From c53294b92ad4164c13ecbb73b8798b0973d01924 Mon Sep 17 00:00:00 2001
From: Daniel Donenfeld <dadonenf@microsoft.com>
Date: Sat, 16 Feb 2019 21:09:30 -0800
Subject: [PATCH] Change merge of asm branches into final branch into
 cherry-pick

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

diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1
index 3c1f48f..a2ed930 100644
--- a/asm/scripts/deploy-asm.ps1
+++ b/asm/scripts/deploy-asm.ps1
@@ -18,7 +18,8 @@ function collectAsm {
             throw "Missing branch for job $($_.jobId)"
         }
 
-        cmd.exe /c "git merge $($branchName) 2>&1"
+        # Use cherry-pick as the asm branches only have a single commit
+        cmd.exe /c "git cherry-pick $($branchName) 2>&1"
         if(-not $?){
             throw "Failed merge of $($branchName)"
         }