[TYPO3-core] Collaborating with sandboxes
xavier.perseguers at typo3.org
Wed Apr 6 23:33:05 CEST 2011
>> 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.
rebase as configured during T3CSB11. Now it works, I had to do the
rebase manually, fix conflicts which resulted in nothing to commit (!)
$ git rebase --continue
to finally being able to push again.
Thanks for the hint.
Release Manager TYPO3 4.6
TYPO3 .... inspiring people to share!
Get involved: http://typo3.org
More information about the TYPO3-team-core