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 merging the detected changes:
First of all, local files are editable in directly in the diff view panel
Second, the icons in the “*” column indicate actions. For example, if you select a row marked with a right arrow and click , the file will be uploaded. For files with differences detected t