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

Re: resolve conflict dialog is confusing

From: spongman <piersh_at_gmail.com>
Date: Wed, 19 Oct 2011 10:12:08 -0700 (PDT)

On Oct 17, 12:57 pm, Bob Archer <Bob.Arc..._at_amsi.com> wrote:
> Mine = Local = Merge Target
> Thiers = Repository = Merge Source

I'm a fan of 'Target' & 'Source'.

Those terms make perfect sense to me.

And apparently to the SVN doc writers:

"usage: 1. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV]
[TARGET_WCPATH]"

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-19 19:12:15 CEST

This message: [ Message body ]
Next message: Simon Large: "Re: Commit one folder onto two servers"
Previous message: spongman: "Re: resolve conflict dialog is confusing"
In reply to: Bob Archer: "RE: resolve conflict dialog is confusing"
Next in thread: Wayne Johnson: "RE: resolve conflict dialog is confusing"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.