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

Re: Update replace files??

From: Jeff Smith <jsmith_at_robotronics.com>
Date: 2007-04-02 20:16:05 CEST

On Monday 02 April 2007 09:45, B. Smith-Mannschott wrote:
[...]
> It will attempt to merge the changes that have been made to the
> repository since your last update into your local files. If it can
> not do so cleanly, it will generate an update "conflict", which I
> would suggest looking up in the Subversion book.
>
> It will not destroy your data. An update conflict, however, can be
> confusing for a beginner.

I might add; often the user (familiar with CVS but not SVN) did not
know to try `svn status` first to see if there are any potential
conflicts. See the note in the book: "CVS Users: Hold That Update!"

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Apr 2 20:17:22 2007

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