| blob | 6125957afb93c49552dd0ab4438f7cceb846d518 |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
127 }
131 }
133 /* Block element titles. */
141 }
144 }
148 }
151 }
154 }
160 }
166 }
171 }
175 }
180 }
183 }
187 }
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 }
200 }
204 }
209 }
215 dl {
218 }
219 dt {
224 }
227 }
231 }
234 }
237 }
240 }
243 }
246 }
253 }
257 }
258 thead {
261 }
262 tfoot {
264 }
267 }
270 }
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 }
278 }
282 }
288 }
291 }
294 }
300 }
303 }
307 }
311 }
315 }
317 div#toctitle {
324 }
329 }
333 }
337 }
341 }
342 /* Workarounds for IE6's broken and incomplete CSS2. */
348 }
355 }
361 }
366 }
370 }
374 }
379 }
381 /* IE6 sets dynamically generated links as visited. */
383 </style>
384 </head>
385 <body>
388 </div>
391 <div class="paragraph"><p>There are situations where you want to include contents in your project
392 from an independently developed project. You can just pull from the
393 other project as long as there are no conflicting paths.</p></div>
395 candidates are Makefiles and other standard filenames. You could merge
396 these files but probably you do not want to. A better solution for this
397 problem can be to merge the project as its own subdirectory. This is not
399 <div class="paragraph"><p>What you want is the <em>subtree</em> merge strategy, which helps you in such a
400 situation.</p></div>
401 <div class="paragraph"><p>In this example, let’s say you have the repository at <tt>/path/to/B</tt> (but
404 branch.</p></div>
414 </div></div>
416 <li>
417 <p>
418 name the other project "Bproject", and fetch.
419 </p>
420 </li>
421 <li>
422 <p>
423 prepare for the later step to record the result as a merge.
424 </p>
425 </li>
426 <li>
427 <p>
429 </p>
430 </li>
431 <li>
432 <p>
433 record the merge result.
434 </p>
435 </li>
436 <li>
437 <p>
438 maintain the result with subsequent merges using "subtree"
439 </p>
440 </li>
441 </ol></div>
442 <div class="paragraph"><p>The first four commands are used for the initial merge, while the last
444 </div>
445 </div>
446 <h2 id="_comparing_em_subtree_em_merge_with_submodules">Comparing <em>subtree</em> merge with submodules</h2>
449 <li>
450 <p>
451 The benefit of using subtree merge is that it requires less
452 administrative burden from the users of your repository. It works with
453 older (before Git v1.5.2) clients and you have the code right after
454 clone.
455 </p>
456 </li>
457 <li>
458 <p>
459 However if you use submodules then you can choose not to transfer the
460 submodule objects. This may be a problem with the subtree merge.
461 </p>
462 </li>
463 <li>
464 <p>
465 Also, in case you make changes to the other project, it is easier to
466 submit changes if you just use submodules.
467 </p>
468 </li>
469 </ul></div>
470 </div>
474 <li>
475 <p>
476 If you made changes to the other project in your repository, they may
477 want to merge from your project. This is possible using subtree — it
478 can shift up the paths in your tree and then they can merge only the
479 relevant parts of your tree.
480 </p>
481 </li>
482 <li>
483 <p>
484 Please note that if the other project merges from you, then it will
485 connect its history to yours, which can be something they don’t want
486 to.
487 </p>
488 </li>
489 </ul></div>
490 </div>
494 </div>
495 </div>
496 </body>
497 </html>