From 54cf763ab136f5847246c740140add8053d7e203 Mon Sep 17 00:00:00 2001 From: Daniel Donenfeld Date: Sat, 16 Feb 2019 21:30:38 -0800 Subject: [PATCH] Try changing cherry-pick into origin/... --- asm/scripts/deploy-asm.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1 index a2ed930..cc352bc 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -19,7 +19,7 @@ function collectAsm { } # Use cherry-pick as the asm branches only have a single commit - cmd.exe /c "git cherry-pick $($branchName) 2>&1" + cmd.exe /c "git cherry-pick origin/$($branchName) 2>&1" if(-not $?){ throw "Failed merge of $($branchName)" }