From 5530359dbcccc337fece238d4211e61946b47d0f Mon Sep 17 00:00:00 2001
From: Daniel Donenfeld <dadonenf@microsoft.com>
Date: Fri, 15 Feb 2019 13:20:30 -0800
Subject: [PATCH] try merging local branches once they are checked-out

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

diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1
index 5fca9aa..0c009f8 100644
--- a/asm/scripts/deploy-asm.ps1
+++ b/asm/scripts/deploy-asm.ps1
@@ -120,9 +120,10 @@ function collectAsm {
         }
 
         git checkout $branchName 2>&1
+        git pull 2>&1
 
-        #Add origin branch to the branch list
-        $branchName = "origin/"+$branchName
+        #Add branch to the branch list
+        # $branchName = "origin/"+$branchName
         $asmBranches += $branchName
     }