0

I have a ms word file named filename.doc. After merge it from trunk to my working branch (sync) tortoiseSVN created 3 new files for conflict resolution:

  • filename.doc.merge-left.r29985
  • filename.doc.merge-right.r29986
  • filename.doc.working

At this time, filename.doc become an encrypted file, invalid for opening with MS Word.

Trying to resolve the conflict with MS Word 2007 does not work, it tries to compare with de encrypted file. With MS Word 2010 it's compared with working file extension ending the conflict.

I read Differences between svn merge left, right & working files after conflicts and svnmerge workflow to understand what is this working file extension and how it works. But I'm confusing about this scenario working in newest MS Word, not on old.

On both machines the merge tool configuration is default. I have SVN Server 1.8.10, TortoiseSVN 1.8.8. Do I have to update all MS Word to 2010 (or newer)?

Community
  • 1
  • 1
  • Just don't merge Word files with default SVN diff|merge tools. PS - filename.doc is not encrypted, just renamed – Lazy Badger Oct 25 '16 at 20:08
  • First, no suggestions? Didn't help. What diff/merge tools do you recommend in this case? Second, encrypted thus when open file I can't read it. –  Dec 05 '16 at 10:56

0 Answers0