[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 18:56:28 +0200

On 19.05.2010 18:48, adam35413 wrote:
> I went to the trunk and looked at the Check-For-Modification option. There
> were the two errors I saw in the merge so I fixed those. However, when I
> went to try to merge again, the same exact errors are appearing when I do
> "Test Merge." I checked for modifications in the trunk again, and there are
> none.

A 'test merge' doesn't modify the working copy, only a real merge does.
And also a test merge shows more conflicts because it doesn't execute
the merge but only guesses what the outcome of the merge would be.

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=2610915
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-05-19 18:56:40 CEST

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