Trouble merging tests from branch

We regularly develop and test multiple versions of our products, using multiple branches in our source control system (in our case, Subversion). Naturally, the soapUI test sources (project files, etc....