[TYPO3-core] Git doesn't want to switch branches anymore

Jigal van Hemert jigal at xs4all.nl
Sun Jun 19 17:26:23 CEST 2011


On 19-6-2011 17:06, Markus Klein wrote:
> did you try a 'git reset --hard'?
> As new submodules where added, you should do a 'git submodules update --init'

$ git reset --hard
error: 'typo3/sysext/workspaces/Classes/Service/Fehooks.php' appears as 
both a file and as a directory
error: typo3/sysext/workspaces/Classes/Service/Fehooks.php: cannot drop 
to stage #0
HEAD is now at 54132b8 [TASK] Cleanup unnecessary calls to reset() or 

At least I could switch back to 'master' (which has all the submodules)

git.exe checkout    master

M	typo3/sysext/dbal
Switched to branch 'master'

Thanks for saving my working-branches!

Kind regards / met vriendelijke groet,

Jigal van Hemert.

More information about the TYPO3-team-core mailing list