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
0
votes
1 answer

Excess tree conflicts after merge of TRUNK into branch

I'm running into dozens of excess tree conflicts trying to merge a subversion branch back into TRUNK after that branch had TRUNK merged into it. Here's what happened in chronological order. Branch was made off of TRUNK and edits were made to…
user1042300
  • 11
  • 1
0
votes
1 answer

how to get list of conflicted files before merging?

I am making a routine to be executed before every merge. It will run unit test and check other config files. FYI, it is coded in node. At the end, if all is allright, it will check if there is any conflict with develop, and just output yes or no to…
Stefdelec
  • 2,711
  • 3
  • 33
  • 40
0
votes
1 answer

TortoiseSVN "tree conflict" on file when merging

I have a directory in my trunk (trunk/gray/catalog/web/app_code/), and my branch (branches/125/gray/catalog/web/app_code/). The trunk and branch contain 8 files common to both, but the branch has 20 files not found in trunk. These files were SVN…
Developer Webs
  • 983
  • 9
  • 29
0
votes
1 answer

Reintegrate a branch back to the trunk when sweeping changes have been made to the tree structure

A brief note before I start: there is a lot of explanation required to "set the stage", and it may seem like this is more of a design question than a question about a programming problem. The question is actually about SVN branching and merging, so…
rory.ap
  • 34,009
  • 10
  • 83
  • 174
0
votes
1 answer

SVN Merge with tree conflict problem

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…
jondow
  • 262
  • 3
  • 12
0
votes
1 answer

SVN Tree Errors

I am new to SVN and I think I made some errors I am not sure how to fix. I am uploading my plugins to WordPress. I uploaded a few versions, then realized that there was a file that I was developing that was not ready and causing issues. So I removed…
Brandon Turpy
  • 883
  • 1
  • 10
  • 32
0
votes
0 answers

Why i am getting Tree conflict here?

Current project structure in SVN Trunk > Folder 1> it contains further folders like A, B,C I have created the branches from Folder 1. Now i realized Folder 1 is redundant.Basically Structure should Trunk > it contains further folders like A,…
emilly
  • 10,060
  • 33
  • 97
  • 172
0
votes
1 answer

What is tree conflict in svn?

I am on svn 1.7.4/ and tortoise svn 1.7.6. I tried to google what is What is tree conflict in svn but could not get some article which explains it in depth except some specific questions. Here is my understanding on tree conflict Say I have trunk,…
emilly
  • 10,060
  • 33
  • 97
  • 172
0
votes
0 answers

svn tags keep getting modified during merges

I am running an svn client on Windows 7. I use TortoiseSVN, but rely mostly on the command line client. I made my own branch cr0 from the trunk and made some local changes to the files there. When I merged these files back to the trunk using the…
gt6989b
  • 4,125
  • 8
  • 46
  • 64
0
votes
1 answer

Why is there a conflict after a SVN branch + switch

My working copy was pointed at Trunk. I had a big code change that I was not ready to commit to trunk, but I want it under version control, so I decided to Branch (creating the repository copy from my Working Copy, not from Head; and selecting…
kmote
  • 16,095
  • 11
  • 68
  • 91
0
votes
3 answers

svn - how to merge a directory that was manually created in two branches?

I am facing a issue with svn merging, here is the scenario Trunk Branch1 Branch2 A new folder 'abc' was created on Branch1 and Branch2 simulataneously, the code-base of both was updated till Branch1 was released. Further code chagnes were made on…
mtk
  • 13,221
  • 16
  • 72
  • 112
0
votes
1 answer

How can I reproduce these kind of git conflict?

I don't understand how added by them and added by us can cause conflict, does anyone know how to reproduce these conflicts?
user3698446
  • 107
  • 6
0
votes
1 answer

(tortoise)svn reintegrate branch - missing file locally

I have an SVN repository (hosted @ googlecode); now the code is split up in 2 branches I worked on both seperately as they tackled slightly different things. Now that I'm finished with both I am trying to reintegrate the side branch into the main…
paul23
  • 8,799
  • 12
  • 66
  • 149
0
votes
2 answers

Cannot find the tree conflicted files after merge

I was trying to merge from one branch(B1) to another(B2). I have followed the given steps: Right click on the folder -> Merge... -> Merge two different trees -> From B1 to B2 (HEAD Revision) -> Merge(checked Compare white spaces option by…
Nidheesh
  • 4,390
  • 29
  • 87
  • 150
0
votes
1 answer

Tree conflict with SVN, even in simplest possible case

I'm trying to merge a trunk into a branch in SVN. I keep getting tree conflicts. I'm fairly sure the following is the simplest possible case of merging a trunk to a branch, but the problem remains: $ svn ls svn://server branches/ trunk/ $ svn ls…
user2635263
  • 278
  • 2
  • 7
1 2 3 4
5
6