From c82c10b362a13121b4592236a82fc94000363855 Mon Sep 17 00:00:00 2001
From: Steve Streeting <steve@stevestreeting.com>
Date: Tue, 11 Aug 2020 11:52:03 +0100
Subject: [PATCH] Stop using rebase in the get latest script

---
 ue4-get-latest.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ue4-get-latest.ps1 b/ue4-get-latest.ps1
index ea2972c..e4b1c1e 100644
--- a/ue4-get-latest.ps1
+++ b/ue4-get-latest.ps1
@@ -80,9 +80,9 @@ try {
         # Use Invoke-Expression so we can use a string as options
         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..."
-        git pull --rebase --recurse-submodules
+        git pull --recurse-submodules
         if ($LASTEXITCODE -ne 0) {
             Write-Output "ERROR: git pull failed!"
             exit 5