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

[Dmitry Dulepov]

Peter,

Peter Niederlag wrote:
> pull does fetch and
> + merge (by default, NOT SUGGESTED!!!)
> + rebase ( by --rebase or by .git/config -> which is suggested setup!!!)
>
> -----------------------------------------------------------------
> _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"
> -----------------------------------------------------------------

That was the most helpful and informative. Thanks!

-- 
Dmitry Dulepov
TYPO3 core&security team member
E-mail: dmitry.dulepov at typo3.org
Web: http://dmitry-dulepov.com/