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

[Steffen Kamper]

Hi,

Am 08.03.2011 10:31, schrieb Peter Niederlag:
> pull does fetch and
> + merge (by default, NOT SUGGESTED!!!)
> + rebase ( by --rebase or by .git/config -> which is suggested setup!!!)
>

i don't get why it's not suggested - i do pull often without any problems.

vg Steffen