dont rely on git config for engine pull

ProjectBorealis · Nov 25, 2024 · 5459bb2 · 5459bb2
1 parent e5e790d
commit 5459bb2
Showing 1 changed file with 10 additions and 1 deletion.
diff --git 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(),