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

RE: Merging is not happening for word documents.

From: Lübbe Onken | RA Consulting <l.onken_at_rac.de>
Date: Wed, 13 Feb 2008 10:07:55 +0100

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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
         

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)

iD8DBQFHsrNpm8gezyP1EasRAv+oAJsGd0ovWttgV4xXhtFoci2X2Om4CACfXYT6
AjLPNr2QiT5Yw6IcNPA9YMg=
=fASa
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
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 10:08:08 CET

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