Add support to rebased branches

openvmp · Oct 28, 2024 · 15355f4 · 15355f4
1 parent ba33c52
commit 15355f4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/partcad/src/partcad/project_factory_git.py b/partcad/src/partcad/project_factory_git.py
@@ -131,7 +131,7 @@ def _clone_or_update_repo(self, repo_url, cache_dir=None):
                             # Need to check for updates
                             origin.fetch()
                             repo.git.checkout(self.import_revision, force=True)
-                            origin.pull()
+                            origin.pull(force=True, rebase=True)
                             pathlib.Path(guard_path).touch()
 
                     if not before is None: