brunopostle/simple-ifc
1
1
Fork 0
mirror of https://github.com/brunopostle/simple-ifc.git synced 2026-03-30 06:53:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Warn about silent entity loss when merging without ifcmerge

Browse source
This commit is contained in:
Bruno Postle 2026-02-27 15:12:57 +00:00
parent 4073fc7777
commit 11565c31fb
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CLAUDE.md
View file

@ -599,6 +599,8 @@ IFC files use STEP Physical File format — plain text, one entity per line —
`.gitattributes` is already committed to this repo with `*.ifc merge=ifcmerge`. `.gitattributes` is already committed to this repo with `*.ifc merge=ifcmerge`.
**Warning:** if `.gitattributes` is not in place (or the merge driver is not configured) when branches are merged, git's standard text merge will silently drop new entities from one branch when two branches have both added entities starting at the same step ID. Always confirm the merge driver is configured before merging IFC branches.
Add the driver to `.git/config` or `~/.gitconfig`: Add the driver to `.git/config` or `~/.gitconfig`:
``` ```
[merge "ifcmerge"] [merge "ifcmerge"]