[TYPO3-core] Collaborating with sandboxes

Peter Niederlag typo3-list at niekom.de
Wed Apr 6 15:07:05 CEST 2011


Am 06.04.2011 13:58, schrieb Xavier Perseguers:
> Hello,
> Did not know with the message whether I should have
> declared "two" remotes or something like that and I thought "rebase" was
> done automatically when doing git pull.

depends on settings. That's why my suggestion is to always do 'git 
fetch' (update object database) and then 'git merge' or 'git rebase' 
depending on the use case. 'git pull' is only one command but, depending 
on config, either ends up in merge or rebase.


Peter Niederlag
http://www.niekom.de * TYPO3 & EDV Dienstleistungen *

More information about the TYPO3-team-core mailing list