ifcgit: use --prioritise-local flag for ifcmerge-forward mergetool

brunopostle · brunopostle · commit 6c18ac96053d · 2026-04-02T22:42:29.000+01:00
diff --git a/src/bonsai/bonsai/tool/ifcgit.py b/src/bonsai/bonsai/tool/ifcgit.py
@@ -473,10 +473,15 @@ def config_ifcmerge(cls) -> None:
                 config_writer.set_value(section, "cmd", "ifcmerge $BASE $LOCAL $REMOTE $MERGED")
                 config_writer.set_value(section, "trustExitCode", True)
         section = 'mergetool "ifcmerge-forward"'
+        new_cmd = "ifcmerge --prioritise-local $BASE $LOCAL $REMOTE $MERGED"
+        old_cmd = "ifcmerge $BASE $REMOTE $LOCAL $MERGED"
         if not config_reader.has_section(section):
             with IfcGitRepo.repo.config_writer() as config_writer:
-                config_writer.set_value(section, "cmd", "ifcmerge $BASE $REMOTE $LOCAL $MERGED")
+                config_writer.set_value(section, "cmd", new_cmd)
                 config_writer.set_value(section, "trustExitCode", True)
+        elif config_reader.get_value(section, "cmd") == old_cmd:
+            with IfcGitRepo.repo.config_writer() as config_writer:
+                config_writer.set_value(section, "cmd", new_cmd)
 
     @classmethod
     def config_push(cls, repo: git.Repo) -> None:
