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

Re: Disabling automatic conflict resolution?

From: <cmpilato_at_collab.net>
Date: 2003-08-18 16:31:22 CEST

"Wadsworth, Eric (Contractor)" <wadswore@fhu.disa.mil> writes:

> She replied, "Yeah, but my working copy is now lost, as it was replaced with
> the merged version. So now I have to manually go through the file and try to
> sort out my code from the other code. I think I'll make a backup of my
> working copy before I update each time."

Her changes are only "lost" if they were exactly the same as changes
someone else made. 'svn diff' will still show the changes she made
that weren't identically made as well by someone else.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 18 16:35:28 2003

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