If we switched from CCSv3.3 to CCSv5.1 we would have to have .project, .ccsproject and .cproject under source control.
As we are several team members working on the same project, occasionally there would arise the need to merge two versions of those files. Especially .cproject looks as if I wouldn't want to do this with the tools we usually use to merge text files.
What is the recommended way to merge two versions of .cproject?
Is it only me who thinks that the way CCS/Eclipse stores project information is ... well, suboptimal?
Regards, Johannes
