On seemlingly random files in my project, the ide has a yellow warning at the top of the file that says either:
"Deployed file on 'host' is changed."
"File needs to be synchronized with deployed on 'host': base revision is not stored yet."
but when i diff the files, they are the same (as I expected them to be).
My setup: on my mac, I have a directory that contains the project files and it is under git. The remote repository is set up using sftp. I never touch any files on the remote server at all and just let phpstorm keep everything synched (i.e. downloading a file from the mac to the remote which all works.
When I click "Merge" on the right hand side of the yellow warning the storm puts up a three panel merge tool where the right and left will have a change that is the same in both but missing from the middle pane (or all three might be the same).
Why is this happening? And how can I make it stop. Attached are relevent screen grabs....