From 5459bb2207e870da267078782c834157fd8aef65 Mon Sep 17 00:00:00 2001
From: mastercoms <mastercoms@tuta.io>
Date: Mon, 25 Nov 2024 11:37:09 -0500
Subject: [PATCH] dont rely on git config for engine pull

---
 pbpy/pbunreal.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pbpy/pbunreal.py b/pbpy/pbunreal.py
index d54027f..46640ef 100644
--- a/pbpy/pbunreal.py
+++ b/pbpy/pbunreal.py
@@ -708,7 +708,16 @@ def download_engine(bundle_name=None, download_symbols=False):
             pbtools.run(
                 [pbgit.get_git_executable(), "-C", str(root), "switch", base_branch]
             )
-        pbtools.run([pbgit.get_git_executable(), "-C", str(root), "pull"])
+        pbtools.run(
+            [
+                pbgit.get_git_executable(),
+                "-C",
+                str(root),
+                "pull",
+                "--rebase",
+                "--autostash",
+            ]
+        )
         pbtools.run(
             [
                 pbgit.get_git_executable(),