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

Re: [Merge] Merge Question - Use local and Use repository

From: sNop <snop3_at_seznam.cz>
Date: Tue, 23 Mar 2010 17:06:21 +0100

> It seems pretty self-explanatory. If you "Use Local" the conflict is resolved using the file that was in your working copy when you started the merge. If you choose "Use Repository" the HEAD revisions from the repository is used.
>
> BOb
>
>

Hi Bob,

sry, I have send email from other account.

thank you for your response. As you wrote when is selected "Use local"
file in WC is used.

But you wrote:

> If you choose "Use Repository" the HEAD revisions from the repository is used.
>

But HEAD rev. from which reposity ? From HEAD trunk or from HEAD rev. of
the branch which i'm merging ?

Thank you for response.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2010-03-23 17:06:27 CET

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