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?

A google search on Tree conflict should give you the answer. — Dipu H
There are many possibilities, but you have probably created files under the same name in both branch and trunk. If you have only created directories, there is not so much to worry about, otherwise you will need to examine the duplicate files by hand. It is important to try to understand what you are doing: read the documentation! — PJTraill

Lazy Badger Lazy Badger · Accepted Answer · 2014-02-07T19:03:09

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

Tortoise Svn reintegrate branch into trunk

2 Answers