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

BlenderBIM Git documentation minor corrections

Browse Source
This commit is contained in:
Bruno Postle
2023-07-01 14:35:32 +01:00
parent e61c572743
commit 84b08fa448
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/docs/users/git_support.rst
+3 -4
View File
@@ -122,8 +122,8 @@ revision you are interested-in and switch as before.
.. Tip::
Conceptually a local branch is equivalent to a remote fork in somebody
else's copy of your repository, and indeed with an external Git tool you
can import their work into a branch in your local repository.
else's copy of your repository, and indeed by adding a remote you
can fetch their work into a *remote branch* in your local repository.
Merging
-------
@@ -137,8 +137,7 @@ Merging
You can merge changes that exist in a selected revision into the current
model, even if changes have been made in both revisions - as long as these
changes don't directly conflict. After the merge you are able to view the
combined changes before discarding or committing them.
changes don't directly conflict.
.. Note::