How to perform the following svn merge? -

I have the following scenario.

There is a new project outside any trunk copy in Branch 1 Branch 2 2 1 Amendment 46079 from the branch 3 Amendment 4 from branch 1 to 4, 46114, the project made on the trunk, by the SVN copy code branch 3 46294 on 3 amendment

There are some changes which are done in both the branch 2 and the trunk

Now I am trying to copy the changes which I used to make from the branch 2 trunk Did so. I am using Windows Turtle svn, anybody can help me please how to merge it so that the history of trunk branch is kept safe from 2.

Thanks in advance.

Assuming that your SVN version support merge tracking, what is missing in your trunk when you decide to merge, changes apply in Brat since 46079 has been done. I advise you that you must combine a series of 'amendments' in turtles as 'merge with the URL', you should use the Br2, 'Modification category for merger' can leave you blank, because the merge tracking Using SVN will automatically determine whether the difference between the brushed and the trunk starts with the rev. 46079. Also, the copy of the work where you merge will include your trunk which is up to date and has been done with all the changes. Please call 'test merge' first to validate your results. There should be no tree contrasts ..