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.

but I *want* the changes made to the Excel files in the branch to be merged into the trunk. If I do the reintegrate then revert, won't I lose those changes? Or, do I need to just copy my changed Excel files from the dev branch *after* reintegrate/revert on the excel-files-only directory

=> I see. I misunderstood. I'm not aware of tricks in TSVN to exclude a particular directory from a reintegrate merge. I think your only option is copying over the changes manually unless someone more clever than I has a solution.

Best,

-Tim

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-03-22 16:34:56 CET