git ignore resolved