[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: Bob Archer <bob.archer_at_amsi.com>
Date: Tue, 23 Mar 2010 10:39:05 -0400

> Dne 22. 3. 2010 15:37, sNop napsal(a):
> > So I have question about Use local and Use repository option in merge
> > dialog:
> > http://img256.imageshack.us/img256/4541/merge1.png
> >
> > Which file is used when I select "Use local" (file in working copy or
> > file in trunk reposity??) and which file is used when I select "Use
> > repository" (file in trunk or file in ^/branches/3.0.0??) ??
> >
> > And have the choices in this dialog the same meaning ?:
> > http://img532.imageshack.us/img532/586/merge2.png
> >
> >
>
> Hi,
>
> any response? I'm asking this, because in the TortoiseSVN documentation
> isn't specified what file is used:
> http://img683.imageshack.us/img683/1395/merge3.png
>
> So i want to know, what file is used when I select "Use local" and what
> file is used when I select "Use repository"
>

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

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-23 15:38:02 CET

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