[TYPO3-dev] GIT Problem with Rebase origin/TYPO3_4-5

[Steffen Ritter]

Hi,
switching between branches, that may or may not have submodules included
already always will lead to problems.
Therefore you must delete the according directories / submodule pointer
manually and then do git reset --hard

If it is the way that a submodule was added a git submodule update
--init might be needed additionally.

regards

Steffen