Keeping remote and local files in sync

Hi all,

I've seen a few posts about this, with nothing that tells me there's a solution out there. I'm working with PyCharm, where I've got it set up to edit locally (a directory on my Mac disk), and save remotely to a Linux server directory in my workspace. This works great so long as I'm the only one making changes, things stay in sync. However, I work in a team against a repository. Every time I update my remote directory from the repository, my remote and local copies of the files are out of sync. Getting them back in sync using PyCharm is a pain at best.

Will this have a solution at some point?

Thanks in advance,

Doug