Your comments

GitHub would be a major (as in seriously major) benefit! All our code goes to GitHub now so it would be invaluable

Yes, that's what I'm talking about. It should be like the sync in dreamweaver. The options of get and put, just get, and just put would be a big improvement in usability. These options, ahead of file merge, are much needed in my opinion.