3 ms·
So you have users editing Office documents and committing changes to SVN and you don't get conflicts? Or if you do, they are able to resolve them?
by ams6110 13y ago
So you have users editing Office documents and committing changes to SVN and you don't get conflicts? Or if you do, they are able to resolve them?
- csmuk 13y agoYes you do get and can resolve the conflicts. Despite common knowledge you can diff and merge office documents with TortoiseSVN. All it does is fire up their built in review/diff tools.
- jessaustin 13y agoFor normal office workers, this contraption really works better than collaboration (and change tracking if you need it) via Google Docs? Wow.