Hello everyone ,
I am facing an issue when i am trying to merge the changes of two branches into the trunk. We had created two seperate branches from the trunk for two seperate features for developement . ( Please see the attached picture). Developer 1 worked uptill rev 68 and left our organisation. while dev 2 continued uptill 80. Someone merged the Developer 2 with the trunk and did a commit. We are trying bring the changes of Developer 1 to the trunk but not able to do so. It deletes the files created by the Developer 2 while doing the merge . Can some one guide me the exact process I know this is a silly question , but i have gone through the svn book but cannot make anything out of it. The merge process which i follow. isswitch the working copy to trunk and use merge two differnt trees . and merge from the trunk to the developer 1 branch. i guess thats how we did it for developer 2 branch ( not sure its the right way). Thanks for the support Please help!!! -- 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/f2658da6-f7cd-4033-aba3-528247e7c4d5n%40googlegroups.com.
