Git, stop overwriting my files!