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

[Steffen Kamper]

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.

You also could try a pull --rebase if pull doesn't work.

vg Steffen