Special branches

[Gerhard Kreuzer]

Hi,

I have two projects which needed totally different project settings (desktop and embedded) but sharing a code base.

I created a trunk.

I creaded a branch.

I altered the project settings and locked the project file.

After that I am able to change code and merge the changes into the other trunk/branch. Works fine.

Problem arises as I tried to add a file (class) the the shared code base. I can't find a way to merge the new file from one trunk/branch to the other.

Any ideas to organize the repository in this situation?

With best regards

Gerhard