Conflicts with the Git deploy branch are difficult/impossible to resolve

[preaction]

If someone else has deployed the site since we've deployed it, we will not be allowed to push the deploy branch. We will instead be dropped on the deploy branch with an error message and barely told what to do.

Since I know what to do, I tried pulling, but the nature of the blog app basically means that every single merge will be a conflict. So, there was a conflict. I don't want to resolve the conflict, because I don't care what the site used to be: The deploy is completely re-building the site.

When using the git deploy, we should try to merge the remote deploy branch before building and committing. If this results in a conflict, we have two options:

• If the deploy branch and development (starting) branch are the same, we can do nothing and must rely on the user to resolve the conflict. This is the safest option
• If the deploy branch is different, we can simply clobber what's there and keep going.

We should add a safe flag to the Git deploy to prevent the clobbering behavior, and always ask the user for guidance on how to continue. This flag should be off by default.