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

Re: copy-modify-merge with office

From: lejeczek <peljasz_at_yahoo.co.uk>
Date: Tue, 12 Aug 2014 13:05:13 +0100

forgive me for I'm a novice and courios
but compare, this works, sill no elaborate way to merge?
this zips tortoise can unzip, look into xml files and
compare, why not merge I wonder?
many thanks

On 12/08/14 11:54, Simon Large wrote:
> On 12 August 2014 10:45, lejeczek <peljasz_at_yahoo.co.uk> wrote:
>> hi all
>> wanted to ask if copy-modify-merge is valid concept for ms
>> office under subversion?
>> I see everybody says request lock for all office docs and I
>> wonder whether it's all precaution or merge actually cannot
>> be done on .docx and likes?
> Subversion can only merge plain (8-bit) text files. All office docs
> are proprietary binary formats and cannot be merged automatically, so
> using locks is the only safe way to work with these files.
>
> Simon
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3086634
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
>

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3086636

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-08-12 14:06:32 CEST

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