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

[Jigal van Hemert]

Hi,

Today I wanted to review https://review.typo3.org/2324

- switched to master
- pulled master
- created new branch (master_26913) and switched to it
- fetched the patch set

I couldn't find any changes, so I pulled the patch set
It produced a endless list of conflicts.

So, I wanted to do it again and decided to switch to master and start 
all over. Alas...

git.exe checkout    master

fatal: bad config file line 1 in D:/TYPO3/TYPO3 Core Git/.gitmodules


Even a forced switch/checkout results in the same error.

For all you command line fans:
xxxx at JIGAL /d/TYPO3/TYPO3 Core Git (master_26913|MERGING)
$ git status
fatal: bad config file line 1 in D:/TYPO3/TYPO3 Core Git/.gitmodules

.gitmodules:

<<<<<<< HEAD
[submodule "typo3/sysext/version"]
	path = typo3/sysext/version
	url = git://git.typo3.org/TYPO3v4/CoreProjects/workspaces/version.git
[submodule "typo3/sysext/workspaces"]
	path = typo3/sysext/workspaces
	url = git://git.typo3.org/TYPO3v4/CoreProjects/workspaces/workspaces.git
[submodule "typo3/sysext/dbal"]
	path = typo3/sysext/dbal
	url = git://git.typo3.org/TYPO3v4/Extensions/dbal.git
[submodule "typo3/sysext/fluid"]
	path = typo3/sysext/fluid
	url = git://git.typo3.org/TYPO3v4/CoreProjects/MVC/fluid.git
[submodule "typo3/sysext/extbase"]
	path = typo3/sysext/extbase
	url = git://git.typo3.org/TYPO3v4/CoreProjects/MVC/extbase.git
=======
[submodule "typo3/sysext/workspaces"]
	path = typo3/sysext/workspaces
	url = git://git.typo3.org/TYPO3v4/CoreProjects/workspaces/workspaces.git
[submodule "typo3/sysext/version"]
	path = typo3/sysext/version
	url = git://git.typo3.org/TYPO3v4/CoreProjects/workspaces/version.git
[submodule "typo3/sysext/dbal"]
	path = typo3/sysext/dbal
	url = git://git.typo3.org/TYPO3v4/Extensions/dbal.git
 >>>>>>> 06860415519db913865e49f9d0ca944ae7b35da3


HELP!!!

-- 
Kind regards / met vriendelijke groet,

Jigal van Hemert.