I don't know exactly what we've todo to solve problems with /server and /_site files. I tryed some time ago to .gitignore them but I failed. Maybe someone with mastery git skills could help us on that?