Current project structure in SVN
Trunk > Folder 1> it contains further folders like A, B,C
I have created the branches from Folder 1.
Now i realized Folder 1 is redundant.Basically Structure should
Trunk > it contains further folders like A, B,C
What i am planning to do
1) First copied the folder A,B,C into Trunk. So structure becomes like this
Trunk > Folder 1> it contains further folders like A, B,C
Trunk > it also contains further folders like A, B,C
2) Merge branch to Trunk so that Modifications under Branch folder (A,B,C) get merged to A,B,C under Trunk
3) Then delete Folder 1 from trunk
But at step 2 i am getting Tree conflict error . I am not sure why ?