RE: Merge Reintegrate conflicted Excel files?

>
> 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?

=> The easiest option I see if you have all those excel files in an exclusive, Excel-only directory would be to do the default reintegrate svn-merge, choose to resolve all conflicts later, then right click and svn-revert that directory before committing the changes to trunk. Then kill that development branch by making it read-only and note in the log why the Excel files are different.

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

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