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

Re: how to solve doc / docx files in conflict ?

From: Milen A. Radev <milen_at_radev.net>
Date: Wed, 23 Jul 2008 12:38:02 +0300

2008/7/23 MagicFX <magicfx0413_at_gmail.com>:
> the default diff / merge editor cannot parse ms word format
> it just treats word as a binary!
> if I wanna resolve docs rathen than plain text files
> how can i do? which diff / merge app should i use?

Look here for a generic way to resolve conflicts in binary files -
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-conflicts.html
(the paragraph starting with "If you have conflicts with binary
files,..."). 

-- 
Milen A. Radev
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-23 11:38:13 CEST

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

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