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

BlenderBIM document Git merge asymmetry (#3096)

Browse Source
This commit is contained in:
Bruno Postle
2023-07-01 09:53:26 +01:00
parent 104fe56612
commit b088a763d8
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/docs/users/git_support.rst
+11
View File
@@ -145,6 +145,17 @@ combined changes before discarding or committing them.
Merging requires the *ifcmerge* tool installed in your `PATH`, if it is
not installed the merge operator will not be enabled.
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
*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
that branches branched-off the `main` branch can generally be merged back into
`main`, but any sub-branches of these will need to be merged back into their
parent-branch *before* merging the parent-branch back into `main`.
Tags
----