git ignore file resolved