Recent PhpStorm 3.0 EAP has got a feature that will help you with synchronization between local and remote files. The Sync with Deployed/Local… action on mapped folders opens a diff view: Besides showing the difference between the local and remote files, the diff view also provides means for mergin…
