Better error handling of merge conflicts on server #12
Description
Let's say you have a project that's 100 commits in and you think it's terrible so you trash your .git folder, do a bunch of stuff and do git push --force to completely rewrite the git history. The remote kestrel repo will not like this too much and throw a merge conflict and fail to push to s3.
Or, let's say you had a project namespace from a while ago that was abandoned and now you make a new project with that name. Similarly, since these .git histories don't match up, you'll get a conflict.
Currently, the solution is rather simple (if you know that you need to do it). You log into the kestrel server, delete the project repo in the repositories folder. Despite the simplicity, you still need to know to do this, which makes it no good.
Instead, if the kestrel server gets an unclean status message after pulling, it should trash the repo and clone it again on its own.