svn tree conflict while merging

Question

Possible Duplicate:
Why am I getting tree conflicts in subversion?

I am trying to merge a file located in "main/dir1/dir2/somefile.txt" from trunk into branch. However the folder "dir1/dir2" does not exist in branch and hence I am getting tree conflict. How can I resolve this so that dir1/dir2/somefile.txt gets created on branch automatically?

Currently I am using the following command to merge all the changes in my current working directory:

svn merge -r 254933:254935 https://svnrepo.de/analytics/trunk my-analytics-dir
 !     C javasource/com/gsi/webstore/platform/component/analytics/dbmigrate/data
 >   local delete, incoming edit upon merge

Can you merge in the revision where you created the directory on the trunk? — Michael Brewer-Davis, Jan 18 '13 at 17:57
i am trying to merge into the current directory which was represented by "." at the end of the command. But to avoid confusion I recently changed it to the explicit directory name. This directory is my branch directory. — user477402, Jan 18 '13 at 19:00
Fix your command to reflect real path used - . and my-analytics-dir **are different things** — Lazy Badger, Jan 19 '13 at 00:17
[Useful reading](http://svnbook.red-bean.com/en/1.7/svn.tour.treeconflicts.html) — Lazy Badger, Jan 19 '13 at 00:18

score 1 · Answer 1 · answered Jan 19 '13 at 00:23

1

svn resolve --accept theirs-full -R javasource/com/gsi/webstore/platform/component/analytics/dbmigrate/data

answered Jan 19 '13 at 00:23

Lazy Badger

94,711
9
78
110

svn tree conflict while merging

1 Answers1