Re: Merging from branch to trunk.

On 19.05.2010 17:11, adam35413 wrote:
> I am trying to get the basics of branch management down, and have run into a
> weird issue. I created a branch from the trunk. I then attempted to do
> Merge -> Reintegrate a branch in the trunk after performing the necessary
> commit/updates. The From URL was the branch folder I created previously. I
> have tried this with a depth of Working Copy and Full Recursive, and the
> following issue always occurs.
>
> In TortoiseSVN, I saw conflicts on two files in the folder. When I looked
> at the log, the message was "The last merge operation tried to add the file
> 'Foo.txt', but it was already added locally." How do I resolve this issue?
> The error occurs for a file I have not modified and for a file I have
> modified in the branch.

You have a so called 'tree conflict' for that file. As the message tells
you, the merge tried to add a file (meaning the file was added in one of
the revisions you're trying to merge), but you also have that same file
already in your trunk. So it was added in trunk and your merge tries to
add it again.

Open the 'check-for-modifications' dialog on a parent folder of that
file, then mark the conflict as 'resolved'.
But you have to decide yourself whether you want to keep the file from
the branch of the existing one on trunk. If you want the file from the
branch, copy it manually from the branch.

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