How to properly organize a workflow for web development?

Question

PHP

There is a web application, vagrant is raised on a working laptop, on VPS 2 versions of the site: dev. and production. How to properly organize work between these versions so that everything is "synchronized"? Now I upload everything via ssh, which is very inconvenient when it comes to minor and urgent edits of the working version (that is, the information on the local server is outdated compared to the combat version). The whole problem is that different environments are configured everywhere, different configs (passwords from the database, and so on). How I see it:
1. I make a new feature / fix a bug on the local server
2. I upload it to the dev, I test
it 3. If everything is ok, then I upload it to the production server
I'm waiting for recommendations and your advice, thanks in advance.

Answer 1

I have a project on a local server (git), then a dev version (git) and production on vps,
when uploading edits, I send everything to bitbucket from a local server, then through phing I merge edits from bitbucket to the dev version, I test if everything is ok , then through sssh using rsync I synchronize the dev version and production. As a result, to synchronize the local version with production, there are only 2 commands, not taking into account the commands of the git

Answer 2

Store your code in a repository like Bitbucket. You don't need to store configs in the repository.
Set up a deployment, there are many tools for this, for example:
magephp.com
capistranorb.com
deployer.org
Then everything will be simple: push the changes to the repository, launch the deployment to the right place.