At 1999-05-26 20:39:35+0000, Richard Brooksby writes:
We frequently merging codelines in which the whitespace has been changed,
or tabs have been accidentally expanded or contracted. Whitespace changes
confuse the "resolve" command so that it sees conflicts where there really
aren't any.
For what it is worth, I think it is usually a mistake to ignore
whitespace conflict. Whitespace is there for a reason, and the amount
and kind of whitespace is what it is for a reason. These reasons are
usually but not always concerned with code clarity. Ignoring changes
to whitespace amounts to saying "those reasons are unimportant".
Changing whitespace also breaks semantics in various programming
languages.
This is not to say that a tool to remove whitespace conflicts is
worthless, just that its use carries various risks of which the user
should be aware.
Nick B
9 messages in com.perforce.perforce-userFwd: Tools for detecting whitespace-o...