[TYPO3-v4] Core projects merge via subtree merge?
Tolleiv.Nietsch
info at tolleiv.de
Mon Mar 7 15:57:51 CET 2011
Hi,
Am 07.03.2011 10:05, schrieb Dmitry Dulepov:
>
> Workspaces is a separate project, right?
>
Right.
> Why don't you simply merge the result into a separate branch and push
> the merged result into the core? This will be a simple commit if I am
> not mistaken.
>
Doing it by hand is a no fun at all - and Git provides some techniques
such as subtree merge or submodules to make this easier and less error
prone (e.g. finding deleted files during a manual merge).
Cheers,
Tolleiv
--
Tolleiv Nietsch
www.tolleiv.de - www.aoemedia.de
Twitter: http://www.twitter.com/tolleiv
More information about the TYPO3-project-v4
mailing list