PhpStorm can automatically synchronize changes over sftp, even when you change branches locally.
On Windows systems that is the best solution I've found so far. On unix/mac systems you can use rsync in combination with a utility that watches for file system changes.