'git pull' before pushing to prevent merge

Fix for #265.