Seems like the “revision control” thing is causing some problems, if you are working alone, better quit that thing I think.