Freeman wrote:
> Hello:
>
> right now we are documenting a project and decide to use OpenOffice an
> its format, but when we have a conflict into a file, We cannot have
> option to do a merge easily, so we experiment with a .doc extension,
> but Tortoise says that we must have MS Office. then:
> 1) How we can compare and resolve conflicts in ODF using Subversion
> and Tortoise calling OOo?
> 2) Why is a must to have MS-Office to resolve conflicts if we have OOo
> and that tool can open MS formats too? tortoise should ask the tool if
> MS-Office isn't installed on the system or open the associated
> application for .doc documents.
This is because Tortoise has nice scripts to handle change management
that call MSWord with special parameters (I think) to show differences
and so on. It still wouldn't automagically merge.
Personally, this is an advantage I find to using text-based formats like
(La)TeX or Docbook. It's just text, so normal diff-and-merge works just
fine.
Sam
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-27 17:35:38 CET