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

RE: Merge Reintegrate conflicted Excel files?

From: Gerald Britton <gerald.britton_at_gmail.com>
Date: Wed, 21 Mar 2012 13:14:16 -0700 (PDT)

> I'm trying to do a merge reintegrate and most of it is working OK. However, I have some Excel files in there that I have under svn. I made changes to them in my branch. Some of them are merging OK but others are giving messages like:
>
>
> Conflicted: C:\Documents and Settings\bri7744\My Documents\CLOC_Remedy_RCIP\7083\bin\Templates\7083 Exec NTF.xls
>
>
> My questions:
>
> 1. Does TSVN treat Excel as binary or text?
> 2. If binary, what does it mean for it to be conflicted?
>
> => Excel files are binary
> => conflicted means that at least some of the 1s and 0s changed differently in both the branch and trunk
> => it's nearly impossible to have the machines handle this automatically and is very error prone and best handled doing a manual copy of conflicted items into your final file
> => good luck
>

Ok, I get it I think. This leads to another question:

I want to do a reintegrate excluding my excel files directory, but the depth field is greyed out. How can I do the reintegrate and ignore that directory?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-03-21 21:14:19 CET

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