Hi, I am using Eclipse 8.6 and Subclipse 1.6, and svn 1.6.x server. I created a branch, made some changes in both branch and trunk, and now I am trying to merge from trunk to this branch. All what I am getting is nothing but tree conflicts for every directory and every file under the root of the branch. I get that even with my test project where I did nothing but edited one file. The problem is that I don't understand what these tree conflicts mean, since I did not change anything. I have only changed one file for testing and I am supposed to get the file update during merge, but this simply gets ignored. All I see in the merge window is tree conflict icons for each directory and each file under the root. Also under Tree Conflics window it tells me "local add, incoming add upon merge" for each of the tree conflicts.
A:
Have you have added any autoformating or anything of that sort enabled ?
The below thread might help resolve your problem.
Version Control Buddy
2010-10-15 12:05:05