Skip to content
This repository was archived by the owner on Nov 24, 2024. It is now read-only.

Commit 6fed9bf

Browse files
committed
BlenderBIM Git documentation minor corrections
1 parent b088a76 commit 6fed9bf

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

src/blenderbim/docs/users/git_support.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ revision you are interested-in and switch as before.
122122
.. Tip::
123123

124124
Conceptually a local branch is equivalent to a remote fork in somebody
125-
else's copy of your repository, and indeed with an external Git tool you
126-
can import their work into a branch in your local repository.
125+
else's copy of your repository, and indeed by adding a remote you
126+
can fetch their work into a *remote branch* in your local repository.
127127

128128
Merging
129129
-------
@@ -137,8 +137,7 @@ Merging
137137

138138
You can merge changes that exist in a selected revision into the current
139139
model, even if changes have been made in both revisions - as long as these
140-
changes don't directly conflict. After the merge you are able to view the
141-
combined changes before discarding or committing them.
140+
changes don't directly conflict.
142141

143142
.. Note::
144143

0 commit comments

Comments
 (0)