Force git pull deploys
Be able to force a git pull deploy. When you try to deploy a significant change in the app code you get merge errors, that could be avoided if the pulls were forced.
I usually fix this kind of issues with the following commands:
> git fetch -all
> git reset --hard origin/<branch>
I'm actually doing this in the server through SSH.
Lucas Nuñez commented