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

[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.

Cheers

-- 

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