Mirrors/UEScripts
1
0
Fork 0
mirror of https://github.com/sinbad/UEScripts.git synced 2025-02-23 13:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop using rebase in the get latest script

Browse Source
This commit is contained in:
Steve Streeting 2020-08-11 11:52:03 +01:00
parent 31885b6032
commit c82c10b362
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ue4-get-latest.ps1
View File

@ -80,9 +80,9 @@ try {
# Use Invoke-Expression so we can use a string as options # Use Invoke-Expression so we can use a string as options
Invoke-Expression "&'$PSScriptRoot/ue4-cleanup.ps1' $cleanupargs" Invoke-Expression "&'$PSScriptRoot/ue4-cleanup.ps1' $cleanupargs"
# Use rebase pull to keep simpler # Stopped using rebase because it's a PITA when it goes wrong
Write-Output "Pulling latest from Git..." Write-Output "Pulling latest from Git..."
git pull --rebase --recurse-submodules git pull --recurse-submodules
if ($LASTEXITCODE -ne 0) { if ($LASTEXITCODE -ne 0) {
Write-Output "ERROR: git pull failed!" Write-Output "ERROR: git pull failed!"
exit 5 exit 5