diff

Sometimes you have several different versions of files or folders related to your project locally, or you’ve just downloaded it from a remote source. In this case it’s crucial to work with the most up-to-date copy. If you need to merge changes and synchronise folders,  then it can become even more complicated, as well as difficult to perform manually without any support. The good news is that you can quickly and conveniently compare and/or synchronize files/folders with guidance and support from your IDE, without any external tools. PhpStorm and other IntelliJ Platform IDEs help you explore

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