[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: Wadsworth, Eric (Contractor) <wadswore_at_fhu.disa.mil>
Date: 2004-07-07 00:03:41 CEST

> I would believe it would make sense, especially in the view of such
> tool as graphical SVN browsers, to consider having commands
> about such.
> Something like:
> - deconflict file
> - resign file
> (maybe the first works)
>
> paul

It would be nice to see a menu option on TortoiseSVN, for example, of "undo
merge" and "undo conflict".

--- Eric

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jul 7 00:08:58 2004

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