Jerry Van Baren wrote:

> Rick Welykochy wrote:
>> I you disagree then please provide an example of a source code file,
>> language processor or other instance where trailing white space actaully
>> can cause trouble. I'm at a loss to find such.
> 
> The problem is that whitespace causes totally unnecessary merge 
> conflicts.  The result is you (or worse, an upstream maintainer) wastes 
> valuable time picking through merge conflicts that should not have 
> happened.  Bugs are inevitably introduced when a merge conflict is 
> resolved incorrectly.

Thanks for the wisdom of experience. I've never experienced white space
hell using CVS. Perhaps it is more of a problem in git.

The only way I got around this on my first commit + patch cycle was to
fix the problem.

I've decided to leave the warning on and fix as I go. It only takes a
few seconds to search for and replace trailing whitespace or whitespace
lines. How did they get there in the first place? <mouth wide shut/>


> This will be painful, but it is painful only once.  Leaving whitespace 
> damage in the source will be a never ending source of pain (death by 
> 1,000 paper cuts).

Peculiar to git, perhaps?



cheers
rickw


-- 
_________________________________
Rick Welykochy || Praxis Services

Finster's Law: A closed mouth gathers no feet.
_______________________________________________
Koha-devel mailing list
Koha-devel@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-devel

Reply via email to