[TYPO3-core] need help with submodules

[Steffen Kamper]

Hi,

i currently worked on a branch for developing a feature. To get all done 
i had to init the submodules in that branch, so i got a clean branch 
with only my code changes.

Now i tried to switch back to master, and it's not possible. It always 
complain about the submodules with "aborting"

How can i switch to master again?

copy from the log:

error: The following untracked working tree files would be overwritten 
by checkout:
	typo3/sysext/dbal/ChangeLog
	typo3/sysext/dbal/class.tx_dbal_autoloader.php
	typo3/sysext/dbal/class.tx_dbal_em.php
	typo3/sysext/dbal/class.tx_dbal_installtool.php
	typo3/sysext/dbal/class.ux_db_list_extra.php
	typo3/sysext/dbal/class.ux_t3lib_db.php
	typo3/sysext/dbal/class.ux_t3lib_sqlparser.php
	typo3/sysext/dbal/doc/class.tslib_fe.php.diff
	typo3/sysext/dbal/doc/manual.sxw
	typo3/sysext/dbal/ext_autoload.php
	typo3/sysext/dbal/ext_conf_template.txt
	typo3/sysext/dbal/ext_emconf.php
	typo3/sysext/dbal/ext_icon.gif
	typo3/sysext/dbal/ext_localconf.php
	typo3/sysext/dbal/ext_tables.php
	typo3/sysext/dbal/ext_tables.sql
	typo3/sysext/dbal/handlers/class.tx_dbal_handler_openoffice.php
	typo3/sysext/dbal/handlers/class.tx_dbal_handler_rawmysql.php
	typo3/sysext/dbal/handlers/class.tx_dbal_handler_xmldb.php
	typo3/sysext/dbal/lib/class.tx_dbal_querycache.php
	typo3/sysext/dbal/lib/class.tx_dbal_sqlengine.php
	typo3/sysext/dbal/lib/class.tx_dbal_tsparserext.php
	typo3/sysext/dbal/mod1/clear.gif
	typo3/sysext/dbal/mod1/conf.php
	typo3/sysext/dbal/mod1/index.php
	typo3/sysext/dbal/mod1/locallang.xml
	typo3/sysext/dbal/mod1/locallang_mod.xml
	typo3/sysext/dbal/mod1/moduleicon.gif
	typo3/sysext/dbal/res/README
	typo3/sysext/dbal/res/Templates/install.html
	typo3/sysext/dbal/res/oracle/indexed_search.diff
	typo3/sysext/dbal/res/oracle/realurl.diff
	typo3/sysext/dbal/res/oracle/scheduler.diff
	typo3/sysext/dbal/res/oracle/templavoila.diff
	typo3/sysext/dbal/res/postgresql/postgresql-compatibility.sql
	typo3/sysext/dbal/tests/BaseTestCase.php
	typo3/sysext/dbal/tests/FakeDbConnection.php
	typo3/sysext/dbal/tests/dbGeneralTest.php
	typo3/sysext/dbal/tests/dbMssqlTest.php
	typo3/sysext/dbal/tests/dbOracleTest.php
	typo3/sysext/dbal/tests/dbPostgresqlTest.php
	typo3/sysext/dbal/tests/fixtures/mssql.config.php
	typo3/sysext/dbal/tests/fixtures/oci8.config.php
	typo3/sysext/dbal/tests/fixtures/postgresql.config.php
	typo3/sysext/dbal/tests/sqlParserGeneralTest.php
	typo3/sysext/version/ChangeLog
	typo3/sysext/version/Resources/Private/Language/locallang_emails.xml
	typo3/sysext/version/class.tx_version_cm1.php
	typo3/sysext/version/class.tx_version_gui.php
	typo3/sysext/version/class.tx_version_tcemain.php
	typo3/sysext/version/class.tx_version_tcemain_commandmap.php
	typo3/sysext/version/cli/conf.php
	typo3/sysext/version/cm1/clear.gif
	typo3/sysext/version/cm1/cm_icon.gif
	typo3/sysext/version/cm1/conf.php
	typo3/sysext/version/cm1/index.php
	typo3/sysext/version/ext_autoload.php
	typo3/sysext/version/ext_conf_template.txt
	typo3/sysext/version/ext_emconf.php
	typo3/sysext/version/ext_icon.gif
	typo3/sysext/version/ext_localconf.php
	typo3/sysext/version/ext_tables.php
	typo3/sysext/version/locallang.xml
	typo3/sysext/version/tasks/class.tx_version_tasks_autopublish.php
	typo3/sysext/version/tca.php
	typo3/sysext/version/ws/.htaccess
	typo3/sysext/version/ws/class.wslib.php
	typo3/sysext/version/ws/class.wslib_gui.php
	typo3/sysext/version/ws/clear.gif
	typo3/sysext/version/ws/cli/conf.php
	typo3/sysext/version/ws/conf.php
	typo3/sysext/version/ws/index.php
	typo3/sysext/version/ws/progress.gif
	typo3/sysext/version/ws/publish.php
	typo3/sysext/version/ws/sys_workspace.gif
	typo3/sysext/version/ws/sys_workspace.png
	typo3/sysext/version/ws/workspaceforms.php
	typo3/sysext/version/ws/wsol_preview.php
	typo3/sysext/workspaces/ChangeLog
	typo3/sysext/workspaces/Classes/BackendUserInterface/WorkspaceSelectorToolbarItem.php
	typo3/sysext/workspaces/Classes/Controller/AbstractController.php
	typo3/sysext/workspaces/Classes/Controller/PreviewController.php
	typo3/sysext/workspaces/Classes/Controller/ReviewController.php
	typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php
	typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php
	typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php
	typo3/sysext/workspaces/Classes/ExtDirect/Server.php
	typo3/sysext/workspaces/Classes/ExtDirect/ToolbarMenu.php
	typo3/sysext/workspaces/Classes/Reports/Aborting


vg Steffen