Hacker News Reader

Yes 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.

For normal office workers, this contraption really works better than collaboration (and change tracking if you need it) via Google Docs? Wow.