If you change your Word settings to save documents in XML format, you
can avoid (or at least mitigate) that problem in the future. XML
documents are just text, and svn can merge those.
You might want to play around with the formats a little, saving a file
and opening it up in notepad. As a general rule, if you can read a file
in notepad, without any silly looking face characters or big, evil
blocks of ... blocks, then svn should be able to act intelligently with
those.
You can also check out xdocdiff
(http://freemind.s57.xrea.com/xdocdiff/e/index.html). It won't help you
do the auto-merge, but it will help you dif 'em.
Good Luck,
Scott
Lübbe Onken | RA Consulting wrote:
> RE: Merging is not happening for word documents.
>
> Hi Abdul,
> Word documents are binary files which can not be merged automatically.
> You can try to resolve the conflict manually by diffing the conflict
> files.
>
> Cheers
> -Lübbe
>
>
> ________________________________
>
> From: Jilani Abdul Khadar Syed [mailto:jilani.abdulks_at_spi.com]
> Sent: Wednesday, February 13, 2008 7:15 AM
> To: users_at_tortoisesvn.tigris.org
> Subject: Merging is not happening for word documents.
>
>
> Hi,
>
> Merging is not happening for word documents.
>
> I have installed VisualSVN server. and TortoiseSVN in my
> system and my friends is istalled only TortoiseSVN version. We are
> working over a network.
> I have added a word doc. file to repocitory and my friend get
> the latest.
> Both of then are read and modified same file.
> My friend has commited the word doc file.
> When I'm committing the file, it is showing conflicts.
>
> How to resolve the situation? Is MERGE is happening for all
> types of file?
>
> Thanks
> S.A.K Jilani
> Software Paradigms (I) pvt., Ltd
> Cell : 91- 9980561355
>
>
-------------------------
Message
Hi Abdul,
Word documents are binary files which can not be merged automatically.
You can try to resolve the conflict manually by diffing the conflict files.
Cheers
-Lübbe
-------------------------
*From:* Jilani Abdul Khadar Syed [mailto:jilani.abdulks_at_spi.com]
*Sent:* Wednesday, February 13, 2008 7:15 AM
*To:* users_at_tortoisesvn.tigris.org
*Subject:* Merging is not happening for word documents.
Hi,
Merging is not happening for word documents.
I have installed VisualSVN server. and TortoiseSVN in my system and
my friends is istalled only TortoiseSVN version. We are working over a
network.
I have added a word doc. file to repocitory and my friend get the
latest.
Both of then are read and modified same file.
My friend has commited the word doc file.
When I'm committing the file, it is showing conflicts.
How to resolve the situation? Is MERGE is happening for all types of
file?
Thanks
S.A.K Jilani
Software Paradigms (I) pvt., Ltd
Cell : 91- 9980561355
-------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-02-13 18:09:38 CET