Update .gitignore for server dir of future merge