[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

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.
- -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.
        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?
        S.A.K Jilani
        Software Paradigms (I) pvt., Ltd
        Cell : 91- 9980561355

Version: GnuPG v1.4.7 (MingW32)


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.

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