1) I am editing a file locally and get stuck.
2) I save it back to FTP and Skype my colleague for help.
3) He makes edits to the file
4) I right-click the file in the Remote Host pane and select Compare with Local Version
5) I get a nice diff showing all changes, but there is no way to merge into my local copy!
6) When I select Download From Here, PhpStorm alerts me "some of your local files or folder may be overwritten or deleted" and I click Continue
7) I then get a success messaeg
8) I then open my local file and it is STILL the same! My colleague's edits do not appear!
This is driving me crazy. What am I missing here?