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

[Stefan Geith]

Am 17.04.2012 15:02, schrieb 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

I now solved my problem doing e.g for workspaces
   > cd typo3/sysext/workspaces
   > git fetch --all
   > git checkout e6f59e7bac441d08e04f214a8532c6548bbeb106
Which is the same revision as in origin/TYPO3_4-5

But how would I do it correctly ?
Should I do a
   > git submodule foreach git reset --hard
before or after the rebase ?

Or schould I do as the very first thing:
   > git fetch --all; git submodule foreach git fetch --all

/Stefan