git merge --no-rebase in case git global has been set to rebase on merge

When checking for conflicts, pushmanager attempts to merge branches and expects the merge to be a  traditional merge. If git global config is set to merge with rebase, then it fails and always detects conflict-master. Adding --no-rebase flag forces it to always behave the way it expects.