Re: Cannot find the conflicted files after merge

On 30.04.2014 15:31, tailorbird wrote:
> 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 default)
>
> Merge finished with tree conflicts.
>
> The issue is I am not able to find any of the conflicted files inside my folder. But the folder is having the conflict mark on it. Is there anything wrong in the above steps?

A tree conflict does not create any conflict files. The conflict is in
the directory tree layout (i.e., 'tree conflict').
right-click on the parent folder and select "check-for-modifications",
then you can see the tree conflicts and resolve them.

Also, you really need to read up on what tree conflicts are:
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-conflicts.html

Stefan

-- 
        ___
   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=3077328
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].