tree-conflict

问题 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

问题 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