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

throw on failed merge

Browse Source
This commit is contained in:
Daniel Donenfeld 2019-02-15 19:00:15 -08:00
parent 7e72576ace
commit 18dedb4838
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,9 @@ function collectAsm {
} }
cmd.exe /c "git merge $($branchName) 2>&1" cmd.exe /c "git merge $($branchName) 2>&1"
if(-not $?){
throw "Failed merge of $($branchName)"
}
} }
#Merge all branches into master #Merge all branches into master