Strange CVS problem (help!!!)

[Dimitrie O. Paun]

On September 6, 2002 05:16 pm, Lionel Ulmer wrote:
> > As of lately, this no longer happens: I get a big fat conflic for all
> > the changes I submit! This is *very* annoying. Anyone knows
> > how to fix this behaviour? Alexandre, are you doing anything
> > different?
>
> Maybe automatic white-space stripping at commit time ?

I was thinking of that, but I get a conflict on _every_ hunk...
How can I avoid it, this is really, really bad. In particular,
if I submit a large patch, and then I continue working on
a different part of the file, I am in trouble...
 
--
Dimi.