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

How to undo a merge / conflict?

From: Wadsworth, Eric (Contractor) <wadswore_at_fhu.disa.mil>
Date: 2004-07-06 19:36:04 CEST

There is probably a simple answer, I'm just not seeing it.

I edit a file, then update, and a merge or conflict happens. Now I want to
get my file back to it's pristine state before I did the update, showing
just my edits. What's the command? How about under TortoiseSVN? The
TortoiseSVN right-click menu only offers "revert" which says it will throw
away all my changes.

**** --- Eric Wadsworth, 520-533-2749

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 6 21:15:21 2004

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

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