Git rule of thumb

If you can't push, fetch and merge (or pull), then try again.
If you can't pull, try a commit!  (You might have an open commit/dirty files which are causing merge conflicts)

If that fails, go to gitref.org.