summaryrefslogtreecommitdiff
path: root/_posts/2009-10-10-subtree-merge.markdown
diff options
context:
space:
mode:
Diffstat (limited to '_posts/2009-10-10-subtree-merge.markdown')
-rw-r--r--_posts/2009-10-10-subtree-merge.markdown2
1 files changed, 1 insertions, 1 deletions
diff --git a/_posts/2009-10-10-subtree-merge.markdown b/_posts/2009-10-10-subtree-merge.markdown
index 53754e0..ab3ef49 100644
--- a/_posts/2009-10-10-subtree-merge.markdown
+++ b/_posts/2009-10-10-subtree-merge.markdown
@@ -5,7 +5,7 @@ description: How to use subtree merge to merge one repo into another as a subpat
categories: git_ninjutsu
---
-There are times when submodules are not adequate for the task at hand. For example, blending multiple repos together into one single repo while still maintaining the history of each repo. To do this, the subtree merge strategy is a better solution.
+<p class="intro">There are times when submodules are not adequate for the task at hand. For example, blending multiple repos together into one single repo while still maintaining the history of each repo. To do this, the subtree merge strategy is a better solution.</p>
Setting up and doing the first merge
------------------------------------