[TYPO3-v4] Git: what to do when a branch "diverges"?

[François Suter]

Hi,

> i did understand, and my answer still is given :)

OK, you did :-)

I didn't understand your answer for lack of Git knowledge.

> Maybe this helps you understanding:
> http://stackoverflow.com/questions/4230552/in-git-editing-a-historical-pre-pull-commit-after-the-pull-causes-divergence-fro

Yep, thanks.

I didn't understand the use of "git pull" actually. I guess it should be 
mentioned somewhere in the contribution walkthrough, but I'm not sure where.

Cheers

-- 

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