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

[TSVN] Request - merge conflict quick resolve - again....

From: Amir Kolsky <amir_at_xpandsoft.com>
Date: 2005-07-21 22:05:33 CEST

Sometimes we have no recourse but to add binary files to the repository...
 
Oft when we merge we see conflicts with these files.
 
Please, please, plase - give us the ability from the Update dialog to click
on the (failed) merged file and to (in one fell swoop) delete it (and all
related fail-merge files) and re-update it. It would save us TONS of work.
 
Thanks,
 Amir Kolsky
XP& Software
 
Received on Thu Jul 21 22:06:16 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.