CVS pedantic when doing merges

[m0llbuz_]

Hi!

I wonder if I can somehow merge a branch to the main trunk, ignoring white 
space diffs. Example:

<<<<< foo.html
=====

>>>>> 1.2.2.1

I also get weird conflicts during merges where the diffs are exactly the same.

<<<<< foo.pm
foo
=====
foo
>>>>> 1.2.2.1

I even get weird conflicts like this (slightly simplified):

<<<<< foo.pm
foo
=====

>>>>> 1.2.2.1
<<<<< foo.pm

=====
foo
>>>>> 1.2.2.1

It is very tiresome to resolve conflicts that I don't care about (white space). 
It's also very annoying when CVS reports multiple conflicts in a file, and when 
I look at it, the complete diff (of the several conflicts) is not a diff, they 
are the same. We all use Linux so there should be no carriage returns. Is it 
extra thorough when doing merges?

Regards,
Kloper 


Red Hat Linux 8.0
CVS 1.11.2
-- 
___________________________________________________________
Sign-up for Ads Free at Mail.com
http://promo.mail.com/adsfreejump.htm