[TYPO3-core] Git: how to solve divergence?

[François Suter]

Hi,

Thanks to all for the feedback. I've got it clean again by using the 
sequence:

git reset --hard
git clean -f
git pull

I'm still not entirely sure what this has done and what impact it had on 
my local branch, but I wanted it clean again and that's the case.

What always makes me worry is whether anything I do locally (along the 
lines of the above) could have an impact on the remote branches at some 
later point (e.g. when I push something).

Cheers

-- 

Francois Suter
Cobweb Development Sarl - http://www.cobweb.ch