I didn't know that CVS has a checkout system option or that it makes a difference for the merging process. :| Oh well, I'm still new at this CVS thingy anyway.
---Jedi Guardian of the Newbie Questions
---Masters of the Force Team Leader / Creator
---Open Jedi Project Lead Moderator / Co-Founder