Stack Overflow
Stack Overflow

Questions tagged [tree-conflict]

A tree conflict occurs in a revision control system when conflicting changes are made to the repository's directory structure on different branches and then those branches are merged.

For example:

  • The same file is added on different branches.
  • A file is edited on one branch and deleted on another.
  • A file is renamed on one branch and edited on another.
79 questions
1
vote
2 answers

How do I avoid a conflict during rebase when a later commit resolves the conflict?

How to easily rebase branch with conflicts that are already fixed at the end of the rebase in git? For example, I am on a feature branch and there are 2 commits in the master branch for the rebase. First commit makes a conflict, but if the rebase…
Lukas Salich
  • 959
  • 2
  • 12
  • 30
1
vote
0 answers

Tortoise SVN: How to synchronize branch with trunk after merging bugfix from branch into trunk

I recreated my issue in a new empty SVN repository: Revision 1: /trunk/ /branches/ Operation: add text file "init.txt" to branch "trunk" Revision 2: /trunk/init.txt /branches/ Operation: create feature branch based on trunk Revision…
Spacy
  • 85
  • 10
1
vote
3 answers

Xcode tree conflicts on merge

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 one of us merges one feature into the other and…
jeydiz
  • 313
  • 4
  • 9
1
vote
2 answers

TortoiseSVN approaches to resolve Tree Conflicts

TortoiseSVN can help with several kinds of tree conflicts using Edit Conflict window. The problem is that in case of "... upon merge" conflict types TortoiseSVN can't guess which files need to be merged. For example, (case: local missing, incoming…
Sergey
  • 13
  • 1
  • 1
  • 3
1
vote
0 answers

Why It gives tree conflicts even though the file is exists in both places in merge?

I am going to do a TotoiseSVN merge. Branch that i am going to merge from has been renamed recently. Some of the files in that branch have been changed after the renaming. When i perform a test merge it shows me tree conflicts only for those files.…
Dinidu Hewage
  • 2,169
  • 6
  • 40
  • 51
1
vote
0 answers

how to resolve this svn tree conflict?

Here is some information about this tree conflict: The last update operation tried to delete/move/rename the directory >'models',but the directory was already edited Conflict Sources: Source Left: http://.../svn/.../models@23800 Source Right: …
sis
  • 68
  • 9
1
vote
0 answers

tree conflicts for files that have only been touched in trunk

I am trying to merge a feature branch back into the trunk with Tortoise SVN. Numerous changes have been made in both, the trunk and the branch, including deletion and movement of folders. Now I would expect SVN to report a tree conflict when the…
Kaiserludi
  • 2,434
  • 2
  • 23
  • 41
1
vote
0 answers

How to resolve SVN tree conflict from duplicated file add?

The same file (an image) was added to both the trunk and my current branch independently and checked in on both. Now there's a tree conflict when I attempt to merge from trunk into my branch. What's the easiest way to resolve this conflict? (just…
notnot
  • 4,472
  • 12
  • 46
  • 57
1
vote
0 answers

svn reintegrate gives strange conflicts

I am having trouble reintegrating a feature branch back into the trunk using Tortoise SVN (v 1.7.13). Project A had some work going on in the trunk and for some other work we need to do in parrallel, we created a branch. Now that the branch work…
timdw5s
  • 63
  • 6
1
vote
1 answer

How do I resolve a SVN tree conflict

I have been reading for days now trying to find a way to resolve tree conflicts using tortiseSVN 1.8. I have two branch off of trunk: branches/3.1 branches/3.2 Again, both of these branches were off of trunk. We do not do "mainline" development…
user2457075
  • 129
  • 3
  • 14
1
vote
0 answers

SVN: Attempt to add tree conflict that already exists / correct SVN workflow

We have a branch created from trunk quite some time ago. I've merged the changes from trunk to this branch with: svn merge url-of-trunk This was painful, because in the meantime someone else applied changes from trunk to this branch, by copying…
Dino
  • 599
  • 1
  • 9
  • 20
1
vote
1 answer

Tee conflict caused by delete/re-add

I deleted and ignored from svn a folder I thought was user specific (nbproject if you're interested). This was careless, it turned out I was wrong, so in a panic to avoid causing a mess, I undid the ignore, added the folder and committed. This was…
Finn
  • 45
  • 4
1
vote
3 answers

svn merge : Tree conflict weird

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 followed: 1. Branch1 Work: newfile.c added and…
rohit
  • 485
  • 1
  • 7
  • 12
0
votes
2 answers

Problem merging trunk into an unchanged branch in SVN

I have a SVN repository where I have the following structure: +-trunk | | | +-dir1 | | | +-dir2 | +-branches | +-tags I'm trying to make some significant changes in dir1, so I created a new branch for it, since dir2 is quite heavy…
Felipe Sodre Silva
  • 211
  • 4
  • 13
0
votes
3 answers

How to make two git branches (with common history) coherent with each other after rebasing one of them?

I think that my title is not clear enough, so I will describe the problem: In my git project, I have 3 branches: master, b1, and b2. Here is the history tree: A---B---C master \ D---E---F b1 \ …
Sopsop
  • 327
  • 2
  • 10
1 2 3
4
5 6