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.
tree-conflict
81
questions
-3
votes
0
answers
49
views
`deleted by us` showing in interactive rebase when the file was neither deleted by us nor them
I've used interactive rebasing numerous times, but perhaps not in such a complex context as I did just now. I'm trying to correct a feature branch. This feature branch is meant to be merged to remote ...
- 9
1
vote
0
answers
67
views
Subversion - why does it try to resolve a tree conflict in a new branch?
I have the following branches setup
\branches
\Foo
\Bar
\trunk
In branches\Foo I have a commit which renames all files (approximatly 3,000 files) with a common prefix for the files. eg. old ...
- 7,541
1
vote
3
answers
2k
views
How does git pull manage commit history?
Let's say I clone a remote repository, and so far it has 1 commit => A. Then, I make two commits to my local branch, and so it becomes => A - B - C. However, my coworker meantime made other two ...
- 33
0
votes
3
answers
113
views
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
\
...
- 357
1
vote
1
answer
32
views
Subversion: Can I tell the conflict resolver, to look for structural changes not on the incomig, but on the local files?
Note: The underlying situation of this question is also part of a slightly different question here.
Situation
I have a trunk, where earlier, a branch has been made from. Then, in the trunk some file ...
- 15.5k
2
votes
0
answers
24
views
Subversion: For merging, how to add renaming meta information later, after the commit?
Note: The underlying situation of this question is also part of a slightly different question here.
Situation
I have a trunk, where earlier, a branch has been made from. Then, in the trunk some file ...
- 15.5k
1
vote
2
answers
479
views
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.
...
- 990
0
votes
1
answer
73
views
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 ...
- 11
0
votes
1
answer
373
views
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 ...
- 2,772
1
vote
0
answers
493
views
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 ...
- 95
10
votes
3
answers
663
views
TortoiseSVN Tree Conflict: can't choose remote file
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 version of ...
- 16.5k
3
votes
1
answer
246
views
svn merge: source under renamed folder not merged
trunk ---------------------------renamed dir a/b to a/g ---------------------
\ /
\ ...
- 759
1
vote
3
answers
3k
views
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 ...
- 323
0
votes
1
answer
1k
views
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 ...
- 1,013
1
vote
0
answers
52
views
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 ...
- 2,193