Attempt at fixing all these git push/pull problems