[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: Tom von Alten <tom.vonalten_at_gmail.com>
Date: Wed, 1 Sep 2010 16:01:42 -0700 (PDT)

David Huang wrote:
> You're merging the *changes* between two revisions, not merging
> the two revisions themselves.

< blink! > Light bulb goes on.

But I still feel a little shaky. I'll work with it a while and see how
I do.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-02 03:17:05 CEST

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