News for hackers. Stuff that matters.

A comment on We are currently taking a DDoS attack and are working to mitigate. Parent comment

Re:We are currently taking a DDoS attack and are working to ... by hp50g on Saturday March 23, 2013 @07:39PM (#5430323)
TortoiseSVN and Word+Excel have great change integration. You can merge word documents quite happily.
[ Parent | on HN ]
Re:We are currently taking a DDoS attack and are working to ... by trumbitta2 on Saturday March 23, 2013 @08:04PM (#5430411)
I stand baffled. Always thought Word and Excel files were binary files, thus almost un-mergeable in any useful - collaborative - manner. Sorry for my misunderstanding.
[ Parent | on HN ]
Re:We are currently taking a DDoS attack and are working to ... by jiggy2011 on Saturday March 23, 2013 @08:31PM (#5430483)
AFAIK word provides it's own diff tools which can be hooked by version control systems.
[ Parent | on HN ]