Tortoise Svn reintegrate branch into trunk

Question

I tried to reintegrate my branch back into the trunk according to the answers of this: Tortoisesvn Subversion 1.8 - merge - no more reintegrate a branch option

But im getting Tree Conflicts.

This is what i have done so far: I synchronized my branch with "Merge a range of revision", specific range (the revision of the last sync to HEAD). So I have all features of the Trunk in my Branch!

Then i performed another update on the trunk. Rightclick on trunk folder->Merge->Merge a range of revision. Entered URL of my branch. Selected "all revisions". Clicked "next" and then only "test merge".

among other things, this messages came:

Tree conflict: ...\trunk\.classpath  
Tree conflict: ...\trunk\.project  
Tree conflict: ...\trunk\lib  

Added: ...\trunk\lib\xy.jar  

for all files in the folder (which already do exist in both)

The same for the other folders.

finally this:

Error: One or more conflicts were produced while merging r3347:3686 into  

Whats the Problem?

Answer 1

Whats the Problem?

Problem

I synchronized my branch with "Merge a range of revision", specific range

• Not needed anymore with 1.8+, performed in bad style - manual defining of range is mauvais ton after implementing mergeinfo in SVN 1.6

Try svn diff --git for trunk and branch and check output

Answer 2

Sometimes I has similar conflicts when try reintegrate feature branch to trunk. This problem appeared in Subversion 1.8 with new symmetric merge algorithm.

I do not dig into problem too deep. I just use option on last page 'Reintegrate merge (old style)' and it is works.

Also I found that in some cases revert conflicts and merge again also solves problem.

So, try revert all changes and merge again. If it does not help - revert and use 'old style' reintegration option.