We have concurrent edits happening on Word documents and I want to make sure that Subversion can handle merging .doc files. Do you know if Subversion handles merges of Word documents well?
The contents of the selected Word document will be combined with your open document. If it's a new document, the contents will appear from the beginning. If you're merging Word files into an existing document, the contents of your inserted files will appear below any existing content.
Open one of the two versions of the document that you want to merge. On the Tools menu, click Merge Documents. On the Original document pop-up menu, select one version of the document. On the Revised document pop-up menu, browse to the other version of the document, and then click OK.
Use TortoiseSVN merge utility with the xdocdiff plugin to compare and merge Office documents
You can use TortoiseSVN in its default installation to view diffs and perform merges of Word documents, it just opens up Word and uses Word's own review/changes mode to do it.
Edit: By default it also has diffing capabilities for PowerPoint, Excel, OpenOffice and StarOffice formats. (Check the TortoiseSVN\Diff-Scripts directory).
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With