Re: Need information on tree conflicts

2009/5/12 Chuck Holzwarth <chuck_holzwarth_at_yahoo.com>:
> We are seeing tree conflicts during merges after going to 1.6.1. My understanding is that the tree conflict is where two objects exist on different branches with the same name. The documentation I have found does not give a good indication of what they are or the method to resolve.

http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-conflicts.html#tsvn-dug-conflicts-tree

Which part is not clear? Help us make it better :-)

> In some cases, the user is trying to merge the trunk into a branch. In this case, it would be good to resolve using the object from the trunk. If merging a branch to the trunk, we would want to keep the version that is on the trunk. The two buttons are confusing. In text conflicts, the info is presented as mine and theirs. One of the developers has done some testing and come up with the following:
>
>  During the meeting you reiterated that, given Branch 1 (which is a local working folder) and Branch 2 (a repository folder), when Branch 2 is merged into Branch 1 and a tree conflict is found, you believe that resolving with local means that incoming changes (from Branch 2) will be kept and when resolving using repository that it is referring to the local copy’s repository version (Branch 1).

I hope not; that makes no sense at all.

>  I did a simple test that shows the opposite is true: When selecting local, it means your working copy prior to any merged updates, and the repository means the incoming changes.
>

Exactly. What else did you expect?

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2231191
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].