Fast-forward of live failed: hint: Diverging branches can't be fast-forwarded, you need to either:hint:hint: git merge --no-ffhint:hint: or:hint:hint: git rebasehint:hint: Disable this message with