When merging a couple of branches (using SVN 1.6.1) where a file has been added on both branches (and then worked on in those separate branches) I'm getting one of the new tree conflicts: C foo.txt > local obstruction, incoming add upon merge I need the changes from both branches, but the tree conflict doesn't give me the us...
I have what I thought was a simple scenario - using TortoiseSVN: 1) I made a branch (B2) of an application (to work on implementing image sprites & JAWR). 2) Testing & development went on as normal on the trunk. 3) I re-based the branch a couple of times over the last few days by: 3.1) Merged trunk (by range of revisions) to my branc...
I don't know when the svn team decided to inflict tree conflicts on us but it has completely broken the merge functionality of svn. I have a branch and I want to merge the latest changes from the trunk into the branch. I've already done one such merge, but this one fails because of a tree conflict. Here's the command: $ svn --force m...
I have to deal with Subversion 1.4 merges at the moment and have found this answer to a question, which exactly describes my problem. The actual question deals with git-style rebase and merge problems with SVN which produce tree conflicts. It includes the following recommendation: [...] instead of range-merging the branch to a workin...
Hi, I recently encountered a very weird behavior of subversion. I just merged my local copy of a branch with a remote branch. Everything went smooth, but I've got 1 tree conflict (local delete, remote update). Okay, thought I, modified the working copy appropriately and ran "svn resolve --accept=working -R .". Subversion told that...
I get this error message from SVN: svn: Attempt to add tree conflict that already exists Now, this has already been asked on this site and the given explanation is that a tree conflict has not been resolved after a previous merge, and now SVN is trying to add the same tree conflict again. So I called "svn status" and marked all tr...
I am using VisualSVN (which uses Tortoise). I accidentally move a folder to a different location. When tries to move it back, SVN pukes with this error. It happened once before and I managed to do some random updates/commits, not knowing what I was doing and it was "fixed". I cannot pull the same magic again, so I need to know how to get...
Has anyone had the experience of moving a file in tortoise and committing successfully, only to later commit a different change and be told of a tree conflict where: the file in its original location has been deleted, but in tortoise is marked as missing the file in its new location is there, but marked as already added. (I use torto...
I have seen other posts on this site with answers, but I think I have a slightly different scenario. My situation is as follows: trunk and branch b1 at a certain point, b1 was 'copied' to trunk as trunk was redundant and branch had all relevant functionality dev continued on b1, and trunk but part of trunks dev involved moving some fil...
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 proje...
Hi, I'm trying to automate some Subversion processes and I'm running into problems with conflicts. When I merge two branches, sometimes I get tree conflicts and regular (text) conflicts. I'd like to be able to resolve everything using the repository copy: svn resolve . -R --accept theirs-full but if there are tree conflicts, it yell...
Here is my scenario: Assume we have an SVN repo with the following content: myfolder myfolder\file.txt Now i create two checkouts of this repo, co1 and co2. In co1 we modify file.txt. In co2 we: svn delete myfolder svn commit Create a new folder named myfolder svn add myfolder svn commit Now if i attempt an update in co1 i get a ...