My company's using git with central repository and each developer clones the repository into their home directory on the dev server which runs Apache, MySQL, etc.
From here, we edit files (for me using vi), test on Apache, then ultimately commit and push any changes to the central repository.
If, between my last pull and push, another developer has commited changes, it's necessary to pull these before I can push, resulting in files on the development server being updated with these diffs. And here lies the problem I've so far been unable to resolve:
On my Mac I launch PHPStorm, create a project from existing sources and set it up using SFTP. It 'clones' my development tree locally and any changes I make via the IDE can be automatically uploaded - this works flawlessly! - and when I'm happy, I log in to the development server and commit the changes.
The problem is when I log into the development server pull other changes - these aren't reflected in the IDE (ie, the IDE doesn't seem to compare local to remote files to see if there have been any remote changes). The only 'solution' I can find is to go to the Tools/Deployment menu and 'download from server', but this downloads *everything*, and as I work remotely, this can take upward of 2 hours for a 200Mb project!
Can I do what I'm trying to do using PHPStorm? As a user of IntelliJ IDEA, I love the interface, but it needs to work with my workflow.
Thanks in advance,