You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: book/07-git-tools/sections/subtree-merges.asc
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,7 +1,7 @@
1
1
[[_subtree_merge]]
2
2
===== Subtree Merging
3
3
4
-
The idea of the subtree merge is that you have two projects, and one of the projects maps to a subdirectory of the other one and vice versa.
4
+
The idea of the subtree merge is that you have two projects, and one of the projects maps to a subdirectory of the other one.
5
5
When you specify a subtree merge, Git is often smart enough to figure out that one is a subtree of the other and merge appropriately.
6
6
7
7
We'll go through an example of adding a separate project into an existing project and then merging the code of the second into a subdirectory of the first.
0 commit comments