Hi Everyone, I am having some issues understanding tree conflicts.
I attempted the following; svn merge -r1:head trunk/com/palcare/listsServices/ branches/production/com/palcare/listsServices/ --accept="theirs-full" and got this; Skipped 'branches/production/com/palcare/listsServices/ListsService.cfc' --- Merging r15942 through r20669 into 'branches/production/com/palcare/listsServices': C branches/production/com/palcare/listsServices/listsentries.cfc C branches/production/com/palcare/listsServices/lists.cfc C branches/production/com/palcare/listsServices/listsService.cfc Skipped 'branches/production/com/palcare/listsServices/ListsService.cfc' U branches/production/com/palcare/listsServices Summary of conflicts: Tree conflicts: 3 Skipped paths: 2 I have read the svn-book and; Using everyone's good friend Mr google I found these; http://stackoverflow.com/questions/738367/why-am-i-getting-tree-conflicts-in-subversion http://blogs.collab.net/subversion/2009/03/subversion-160-and-tree-conflicts/ But I must be missing something... They all seem to be about having local edits in a file that has subsequently been deleted in the repository - prior to me getting my edits committed. I'm not sure how to transpose that into my case. I have no local edit of the destination path/files. They are up to date.(svn update) (In fact I even went to far as to use the OS to delete the path and run svn update to restore them to the current version in the repo) Ultimately I simply want my production branch to match exactly what is in the trunk for the specified path. I "thought"; Surely accept="theirs-full" should be saying I don't care about my working copy's destination path - simply make it look like the source path? I could simply replace with an os file copy and then commit the branch - but that just seems wrong. Can anyone can shed some light on the matter for me, please? Beau.
