para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change merge of asm branches into final branch into cherry-pick

Browse Source
This commit is contained in:
Daniel Donenfeld 2019-02-16 21:09:30 -08:00
parent 18dedb4838
commit c53294b92a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
asm/scripts/deploy-asm.ps1
View File

@ -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)"
}