Cannot update local file based on server changes

Hello,

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?

7 comments

Hello!

Could you please attach screenshot of Compare with Local Version dialog. It should allow merging changes into local file. To double-check mapping is ok, invoke Alt+F1 on that file in Remote Host, choose Ptroject View and check content of that file.

Best regards,
Elena

0

Dear Elena,

I figured it out in the end. I was expecting something on the toolbar, and eventually saw the triangles. But they are only from remote to local in this case, right? Why is that?

Best,
Erez

0

Hi Erez,

Can you please provide the screenshots of what you see and highlight the part under question?

Thanks,
Kirill

0

Sure thing!

Thanks for the prompt reply, my deadline is today.



Attachment(s):
Compare.png
0

Thanks for details,

The screenshot shows differences between your local file (editable) and deployed file (read only). You can apply individual remote changes to your local file by clicking on there '<<' icons.

At the moment WebStorm does not support applying individual changes to the server, Instead, One is expected to pick up remove changes, close the dialog, (probably review local file to decide if it is ready to go to production) and then upload file as a whole using respective context menu or main menu action.

Please submit a feature request if this workflow does not satisfy: http://youtrack.jetbrains.net/issues/WI#newissue=yes

Regards,
Kirill

0

Hi Kirill,

Okay, that's what I figured. That's fine -- I just want to describe the software as it currenty is. Many thanks!

(p.s, I'm impressed so far. Way, way better than the previous version)

Best,
Erez

0

Thanks for your feedback,

Don't hesitate to ask here any questions that you have!

Regards,
Kirill

0

Please sign in to leave a comment.