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

Conflicts with binary files

From: AvNi ShAh <ajshah16_at_hotmail.com>
Date: 2006-03-14 16:57:25 CET

Hi,

  My project has a lot of binary files (such as Excel and PowerPoint) that create conflicts when multiple users edit the document.  Is there a way to keep (merge) all the changes made by all users in those documents instead of having to use the Revert (to keep repository version, and undo all local changes) or Resolved (to keep your version, overwriting repository changes).  This would help reduce the amount of double editing since the users would not have to edit the repository document again.  If you could, please email me back directly.  Thanks for your time. 


Sincerely,
Avni  
--------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org For additional commands, e-mail: users-help@tortoisesvn.tigris.org Received on Tue Mar 14 17:26:31 2006

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