Re: Merge Reintegrate conflicted Excel files?

On Wed, Mar 21, 2012 at 15:53, Gerald Britton <gerald.britton_at_gmail.com> wrote:
> 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?

Excel files are binary, period. There is no other way TO treat them.

> 2. If binary, what does it mean for it to be conflicted?

It means they differ between the 2 locations being merged. You have to
sort it out manually.

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

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