[TYPO3-dev] Troubles with submodules in Git

[Steffen Gebert]

On 05.10.11 16:19, Dmitry Dulepov wrote:
> Hi!
>
> Steffen Gebert wrote:
>> Don't use checkout, use cherry-pick instead to grab patches from Gerrit.
>
> I already do:
> - make a copy of origin/master (I have many local branches with patches)
> - git fetch ssh://dmitry@review.typo3.org:29418/TYPO3v4/Core
> refs/changes/78/1778/2 && git cherry-pick FETCH_HEAD
>
> That's cherry-pick from Gerrit.
>
>> To resolve your situation, I'm unsure (often a trial and error also for
>> me). Have you tried `git checkout -- typo3/sysext/dbal ....`?
>
> Not sure how I should checkout in submodules :(
Have you tried to enter that line? (replacing ... with the other SM paths)
This would restore the SM pointer from HEAD and drop your local changes.

Kind regards
Steffen

-- 
Steffen Gebert
TYPO3 v4 Core Team Member
TYPO3 Server Administration Team Member

TYPO3 .... inspiring people to share!
Get involved: http://typo3.org