Synching when using PhpStorm on 2 computers Follow

I am using PhpStorm on 2 computers (NOT simultaneously at the same time) and I use the "always" option to "upload changed files to the default server".
I have the following problem:
I edit a certin file in computer #1, and it is uploaded to the server. So now I have the new file on the server and locally on computer #1.
Later, when I want to edit the same file in computer #2, I get the "old" file from the local computer #2 instead of the "new" file from the server, without even getting a warning that there is a newer version the this file.

I've tried to select "Warn when uploading over newer file / compare timestamp & size" and checked "Notify about remote changes", but then I get notification on ALL files, even ones that were not changed (maybe something to do with wrong timestamp (when uploading files I am getting all the time "Failed to change timestamp of the file ....")

Another option is to sync everytime I run PhpStorm, but this takes a long time...

Any solution??

Thanks,
Gal