Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-13 10:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bruno Postle
2026-04-02 22:42:29 +01:00
parent 9d42f4c1ee
commit 6c18ac9605
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/tool/ifcgit.py
+6 -1
View File
@@ -473,10 +473,15 @@ class IfcGit:
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: