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

[François Suter]

Hey Peter,

> -----------------------------------------------------------------
> _fetch_ is "get all known objects from remote"
>
> _merge_ is "combine two(or more) different line sof development"
> _rebase_ is "put aside commits the other one doesn't have, update, and
> reapply the commits"
>
> _cherry-pick_ is "get one(!) commit and apply it soemwhere else"
> -----------------------------------------------------------------

So was doing "git pull" correct in my case? It certainly felt so in my 
scenario and I had the impression of having - after doing it - a healthy 
base from which to do my push.

Cheers

-- 

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