I've had similar conflicts when, for example, I open/save a file in an editor that automatically trims end-of-line spaces.