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 -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/9a65179c-5d31-4f06-8773-8107431945cd%40googlegroups.com.
