One tool I’m always using is Beyond Compare.  This is one of those ‘what did I do before I discovered this’ tools.  Folder compare, remote compare over FTP, merge, etc.  All the good stuff you expect in a diff tool.   … Continue reading →