How to deal with Version Control branches and Script.tcScript file

Hi,

In my company we work with TFS and use a development branch for each new test we define and then we merge it to the main branch once finsihed.

We haven't figured it out how to deal in a proper way when there are parallel branches adding new Script files to the project because both modify Script.tcScript file adding new entries with the same node item Name (e.g. Node name="item0000000445").

We want to avoid having to merge to main branch (and back from man branch to ongoing development branches) everytime a new script file is added to the project...

Any suggestions?

Thanks.