Can I merge two Microsoft Word documents reliably with Subversion?

svn merge ms-word
Chris Sutton picture Chris Sutton · Sep 18, 2008 · Viewed 32.4k times · Source

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?

Answer

Christian C. Salvadó picture Christian C. Salvadó · Sep 18, 2008

Use TortoiseSVN merge utility with the xdocdiff plugin to compare and merge Office documents

Related questions

Why am I getting tree conflicts in Subversion?

I had a feature branch of my trunk and was merging changes from my trunk into my branch periodically and everything was working fine. Today I went to merge the branch back down into the trunk and any of the …

Read More
Merge a Branch into Trunk

I'm facing a peculiar problem with SVN merge. I want to merge from a dev branch to trunk. We have multiple dev branches cut off the trunk at the same time. I'm merging one of those branches to trunk with …

Read More
SVN how to resolve new tree conflicts when file is added on two branches

When merging a couple of branches (using SVN 1.6.1) where a file has been added on both branches (and then worked on in those separate branches) I'm getting one of the new tree conflicts: C foo.txt > local obstruction, incoming …

Read More