[TYPO3-v4] Core projects merge via subtree merge?

[Tolleiv.Nietsch]

Hi Git enthusiasts,

Karsten pointed me to "subtree merge" as possible strategy to merge the 
Core projects (in my case workspaces) to the Core. A documentation for 
that can be found in [1].

The merge itself is straight forward and worked pretty nice in my tests. 
Nevertheless it raises some questions:

1) Is this (really) the way to go for merges? Any other strategies to 
look at before we decide that?

2) Should the commits from the projects be squashed before the push?

If we're not squashing the commits then they would be kept as single 
commits even in the Core. We'd have a complete log in that case but 
using gerrit might get quite annoying since we'd have to push all the 
commits (again) trough the process again (lot's of mails for all of us).

Not squashing them combines everything into a single merge commit  but 
seems a bit SVNish ;)

3) Could someone who's able to bypass gerrit do that so that we keep the 
history but avoid overload?

Cheers,
Tolleiv

[1] 
http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
-- 
Tolleiv Nietsch
www.tolleiv.de - www.aoemedia.de
Twitter: http://www.twitter.com/tolleiv