[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 19 May 2010 19:44:34 +0200

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&dsMessageId=2610933
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-05-19 19:44:44 CEST

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