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

[Steffen Kamper]

Hi,

Am 08.03.2011 09:24, schrieb François Suter:
> Hi,
>
>> i wasn't in this situation yet, but first you should pull the latest
>> changes so you are up-to-date. If this gives you conflicts, try to
>> resolve them eg with phpStorm. Use the changes tab to see the conflicts,
>> use context menu to resolve changes. Then ammend your commit until it's
>> clean. Don't push something that has conflicts.
>
> I have no conflicts. I did a "git fetch --all", after which I got the
> message I mentioned. What don't understand now is whether there's any
> other step I need to take in order not to have this message about
> "divergence" or if I don't need to worry about it and just go ahead.
>

fetch doesn't make a commit, so after fetch your last commit is still 
behind the HEAD.
pull does a fetch + commit, so this is the way i do always to be up to 
date. Don't be afraid, you can do this many times.
If pull doesn't solve it, try pull --rebase

vg Steffen