Check all remote branches against your current HEAD and staging for merge conflicts, without having to actually merge.
pip install conflictwatch
conflictwatch
will let you know if origin/master will have a merge conflict
conflictwatch --all-branches
will check all remote branches include origin/master
Note: This is definitely in BETA.