kdevelop + cvs + .kdevprj + multiple developers = big headache

[Bob Tanner]

Am I doing something wrong or do all you live through the headache that comes 
with multiple developers, cvs and the .kdevprj file?

When it's time to merge, the .kdevprj file is always a conflict and it's hard 
to resolve the conflicts.

Especiallly the Makefile.am entries.

Any help to make merging easier?

-- 
Bob Tanner <tanner at real-time.com>         | Phone : (952)943-8700
http://www.mn-linux.org, Minnesota, Linux | Fax   : (952)943-8500
Key fingerprint = AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288

-
to unsubscribe from this list send an email to kdevelop-request at kdevelop.org with the following body:
unsubscribe »your-email-address«