tree-conflict

I'm using TortoiseSVN to merge into branch-B the latest changes from trunk , including a folder rename. Before that, I reintegrated branch-A into trunk . In that branch, a folder had been renamed and changes had been made to the files in it. Branch-B contains different revisions to those files, but the folder still has the original name. When merging trunk into branch-B , SVN simply adds the renamed folder as new, and reports a tree conflict on the originally named folder. The file revisions themselves are never merged and I'm left with both folders. I've tried multiple options to get the

In Xcode I noticed that .DS_Store and *.xcuserstate always change and don't need to be commited. So, I wrote a .gitignore file that contains this: .DS_Store *.xcuserstate among other entries. Then I used: git rm --cached *xcuserstate git rm ---cached .DS_Store To remove the these file types already under version control. However, when I go to merge Xcode tells me that there are changes that need to be committed. Those changes include .DS_Store files and .xcuserstate files. So, I tried this: How can I Remove .DS_Store files from a Git repository? find . -name .DS_Store -print0 | xargs -0 git rm

How to resolve tree conflict in current scenerio. C:\DevBranch C:\MyBranch I updated both branches. Edited MyBranch and then committed back. Now want to merge those changes into DevBranch. When I am doing the merge I am getting 'Tree Conflicts' The last merge operation tried to add the file 'abc.def', but it was already added locally. How do you want to resolve this conflict? Keep the file from repository Keep the local file How can I resolve? What you can do to resolve your conflict is svn resolve --accept working -R <path> where <path> is where you have your conflict (can be the root of your

I had a feature branch of my trunk and was merging changes from my trunk into my branch periodically and everything was working fine. Today I went to merge the branch back down into the trunk and any of the files that were added to my trunk after the creation of my branch were flagged as a "tree conflict". Is there a way to avoid this in the future? I don't think these are being properly flagged. gicappa I found the solution reading the link that Gary gave (and I suggest to follow this way). Summarizing to resolve the tree conflict committing your working directory with SVN client 1.6.x you

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 branch-b2 working copy, resolving conflicts during the merge. 3.2) (after testing branch-b2), I commit the re-based branch-b2. This all worked as I expected. But merging the branch back into the trunk is having its way with me: 4) After all updates committed in branch

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 usual .working, .merge-left & .merge-right files -- which is understandable due to the nature of the conflict. There are quite a few of these conflict, and ones where a delete of the same file has occurred on each branch, but they're simple to resolve. How can I resolve this