no rebase

SpareCores · Sep 4, 2024 · e5350b9 · e5350b9
1 parent b67f84d
commit e5350b9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/inspector/repo.py b/inspector/repo.py
@@ -41,7 +41,7 @@ def push_path(path: str | os.PathLike, msg: str):
     changes = repo.untracked_files + repo.index.diff(None)
     if len(changes):
         origin = repo.remote(name="origin")
-        origin.pull(rebase=True, strategy_option='theirs')
+        origin.pull(strategy_option="ours")
         repo.index.add(path)
         repo.index.commit(msg)
         origin.push()