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

Re: How to undo a merge / conflict?

From: Michael W Thelen <thelenm_at_cs.utah.edu>
Date: 2004-07-06 21:17:26 CEST

* Wadsworth, Eric (Contractor) <wadswore@fhu.disa.mil> [2004-07-06 13:13]:
> 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.

Look for a file called <file>.mine, where <file> is the name of the file
you were editing. That will contain a copy of the file with your local
edits before you ran the update. You can just rename <file>.mine to
<file> and then run "svn resolved <file>" to throw away the changes
caused by the update.

-- Mike

-- 
Michael W. Thelen
It is a painful thing
To look at your own trouble and know
That you yourself and no one else has made it
                -- Sophocles, "Ajax"

Received on Tue Jul 6 21:52:29 2004

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