[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging from branch to trunk.

From: Rafael M. Heise <rmheise_at_gmail.com>
Date: Wed, 19 May 2010 19:32:14 -0700 (PDT)

I had a similiar situation a few days ago. But in my case, I have
changed the merge-info property.
So, when the merge was doing, the tortoise was trying to add the file,
but this file wasn't added in the branch.
I fixed it changing the merge-info property in my trunk\, and then I
merged this revision in my all branches.
So, when I reintegrated the branch, the conflict wasn't happens.

Rafael

On 19 maio, 14:44, Stefan Küng <tortoise..._at_gmail.com> wrote:
> On 19.05.2010 19:26, adam35413 wrote:
>
> > I went ahead with the merge, and the same issue was there; two tree
> > conflicts.  When I went to one of the conflicts and did Edit Tree Conflicts,
> > I saw the following:
>
> Sure, if there is a conflict it won't go away no matter how many times
> you try the merge.
> Just resolve the conflict and then commit your merge.
>
> 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&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2611060

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-05-20 04:32:23 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.