If you get this error you are most probably working on a Mac computer. This error occurs because you rename a file using GUIs and this changes are not reflected in the repository. Fix: E-mail Neil with the error code and he will delete one of the conflicting files and you should be able to pull and push again. You can also reclone the repository and start from scratch.