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 a...

I have come across the following basic Tree conflict: Local add, incoming add upon merge. I know we can use svn resolve --accept working file to resolve it, but SVN prevent me to use accept their-...

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 ...

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 a...

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'm working in team with git and every time we try to merge code we have a tree conflict. We're currently working with git flow and we usually start features from develop, when the task is finished...

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, remot...

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...

Here's the scenario: User1, Branch1: adds "abc.def"; commits. User2, Branch2: adds "abc.def" (same file name, but more details in the file); commits. Now User1 wants to merge the updated versio...

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...

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:...

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. Th...

I'm pretty new to subversion and the docs just aren't making sense to me. I was wondering if someone could break down this error message (from svn st) into plain English, as well as the other one I...

I have this scenario: A folder with the content is deleted from the local copy of our branch. The changes are committed in SVN Branch. (We still have this folder in Trunk) Now i want to merge ev...

This is more of a hypothetical question, but I've always wondered why this case is considered a conflict. If I've locally deleted a directory which has already been deleted from the repository, why...

I'm trying to do a git merge master from another branch, then I got this conflict: <<<<<<< HEAD =======    t.text     "label_en"    t.text     "help_text_en"    t.text     ...

I am getting Tree conflict in SVN. It's weird! I have standard Trunk, Branches, Tags structure, and follow multiple team model. Branch1, Branch2 are created form Trunk and active parallely Steps ...

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 ...

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.t...

In SVN I have a tree conflict upon merging two branches. The tree conflict arises because I have added a the same file or the same directory in both branches. Much the same question is asked here: ...