[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: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: Thu, 14 Feb 2008 22:38:09 +0100

Hi Jilani,

On 13/02/2008, Jilani Abdul Khadar Syed <jilani.abdulks_at_spi.com> wrote:
> 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?

By default SVN doesn't merge these files, but the TSVN installation delivers
merge scripts (C:\Program Files\TortoiseSVN\Diff-Scripts). I've never used
them myself, but you should be able to link these scripts to .doc files in
the TSVN settings for external merge tools.


   // \\  @@     "De Chelonian Mobile"
  / \_/ \/._)    TortoiseSVN
<\_/_\_/ /      The coolest Interface to (Sub)Version Control
  /_/   \_\      Check out http://tortoisesvn.net
Received on 2008-02-14 22:38:26 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.