Git ignore before merge