On Tuesday, June 15, 2021 at 12:44:58 PM UTC+2 [email protected] wrote:
> 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. > No, don't merge trees. Use the "merge a range of revisions" option in the merge dialog, then select the revisions of the branch that dev1 created (27-68) onto trunk. -- 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/351c88a4-a97d-4034-b863-3385f2042043n%40googlegroups.com.
