We have two braches in TFS(Standard and Enterprise) of which many of the files are common. How do we manage changes in both?

Question

Hi,

We have two folder structures in TFS(two seperate braches) for same application. One branch managing normal desktop application and another with client-server architechture. The later one has extra features. Apart from few files, most of the files are common between the branches.

If we have a change, we have to do it in both the structures. We want to minimize this by using single copy of common files. Is there any way we can keep all the common files in a one folder structure and application-related files in different folder and still build the solution with out any issues?

Naresh.