Do a git pull before push.

Also, do not force push.

Implements what was discussed in #1396.
Should it be '%s:%s' like below?