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

[Karsten Dambekalns]

Hi.

On 19.06.2011, at 16:42, Jigal van Hemert wrote:
 ...
> fatal: bad config file line 1 in D:/TYPO3/TYPO3 Core Git/.gitmodules
 ...
> .gitmodules:
> 
> <<<<<<< HEAD
> [submodule "typo3/sysext/version"]
> 	path = typo3/sysext/version
 ...
> [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/Extensions/dbal.git
> >>>>>>> 06860415519db913865e49f9d0ca944ae7b35da3

As in the days of SVN, this "syntax" of <<<, === and >>>  marks the conflicts. So it could have been an option to simply decide on one of the chunks and try the checkout.

But a reset is also a good option to back out of seemingly "catastrophic" situations.

Regards,
Karsten
-- 
Karsten Dambekalns
Gimme Five!
http://typo3.org/gimmefive


-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 2216 bytes
Desc: not available
URL: <http://lists.typo3.org/pipermail/typo3-team-core/attachments/20110620/7007b931/attachment.bin>