Archived my copy of the site and downloaded a fresh one from the development account, before syncing the main site to it, after spending too much time trying to track down what changes the developer had actually made. In future I can just do a 2-stage sync to migrate any files to the main site.