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

Fix various typos in src/ifcgeom* subdirs

Browse Source
This commit is contained in:
luzpaz
2023-07-07 14:36:01 +00:00
parent 3e7afbed08
commit 1819a45e4c
18 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/docs/users/git_support.rst
+1 -1
View File
@@ -147,7 +147,7 @@ changes don't directly conflict.
When two branches have diverged, merging an IFC model requires *conflict
resolution* (because added entities may inadvertently reuse the same Step-IDs),
this means that data on one side or the other may be rewritten by BlenderBIM in
order to accomodate both sets of changes. ie. the merge process is
order to accommodate both sets of changes. ie. the merge process is
*asymmetrical*. BlenderBIM privileges data in the remote `origin/main` branch
over the local working branch, similarly it privileges data in the local `main`
branch over any other local working branch. The practical result of this is