Try to avoid conflicts

SpareCores · Sep 4, 2024 · b67f84d · b67f84d
1 parent 9dfdefc
commit b67f84d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/inspector/repo.py b/inspector/repo.py
@@ -38,12 +38,12 @@ def get_repo(repo_url=REPO_URL, repo_path=REPO_PATH):
 @synchronized
 def push_path(path: str | os.PathLike, msg: str):
     repo = get_repo()
-    repo.index.add(path)
-    changes = repo.index.diff("HEAD")
+    changes = repo.untracked_files + repo.index.diff(None)
     if len(changes):
-        repo.index.commit(msg)
         origin = repo.remote(name="origin")
-        origin.pull(rebase=True)
+        origin.pull(rebase=True, strategy_option='theirs')
+        repo.index.add(path)
+        repo.index.commit(msg)
         origin.push()