Small refactoring of the push and merge guards
Small refactoring of the push and merge guards

I think that this makes the logic of the when to push or sync a little
easier to read.

DustinH/gitdocs,DustinH/gitdocs,acant/gitdocs,Ammar12/testapp,DustinH/gitdocs,Ammar12/testapp,acant/gitdocs,nesquena/gitdocs,nesquena/gitdocs,nesquena/gitdocs,acant/gitdocs