Re: [PATCH] Add [HOWTO] using merge subtree.

[Junio C Hamano <gitster@pobox.com>]

Junio C Hamano <gitster@pobox.com> writes:

> Miklos Vajna <vmiklos@frugalware.org> writes:
>
> NAK.  It may be well intentioned, but it lacks too much context
> to be usable as a generic teaching material.
>
>> +Abstract: In this article, Sean demonstrates how one can use the subtree merge
>> + strategy.
>> +Message-ID: <BAYC1-PASMTP12374B54BA370A1E1C6E78AE4E0@CEZ.ICE>
>> +
>> +How to use the subtree merge strategy
>> +=====================================
> 
> Here, before diving to the actual command sequence, you need to
> tell the reader what the objective of the whole exercise is.

Just to avoid discouraging contributors too much, here are
pointers to some other materials in the mailing list archive
that may serve as the basis for the "discussion" section of this
HOWTO.

Side note.  I think an ideal HOWTO should

- describe the objective briefly so that the reader can tell if
  that is relevant to the task at hand;

- describe the procedure;

- mention other possible avenues and discuss pros and cons, so
  that the reader can make an informed decision to employ or not
  to employ the solution.

My complaints were that the original had only the second part.
And this message is to give pointers to possible material for
the third part.


* http://thread.gmane.org/gmane.comp.version-control.git/39443

This was the explanation on the way how the initial git-gui
subtree merge was created.

* http://thread.gmane.org/gmane.comp.version-control.git/39963

The introduction of subtree strategy.  The original cover letter
and the following discussion is rich with discussions on merge
philosophy and pros and cons.

Back then "submodule" was not available, and we would still
avoid it today in git.git, because use of submodule in a
repository would make the repository non-interoperable with any
clients older than 1.5.2 series (that's one pros-and-cons item).

Somewhere in the thread it was also suggested "am -pN" may be
necessary.

* http://thread.gmane.org/gmane.comp.version-control.git/46569/focus=46609

This is a side note -- it turns out that "am -pN" used on the
context of subtree merge is often not necessary, as --3way is a
magic.