Most appropriate version control and synchronization system for webDev?

Question

git

There is such a development scheme.
There are 2 CentOS6 servers, they have Bitrix Web environment.
Tell me, please, what is better to use to synchronize sites?
We are developing on a test one - I would like to send all changes as a commit, without thinking and not remembering what needs to be transferred.
There is a situation that they urgently corrected it in combat, but forgot it at home, it would be nice to find out what they forgot.
And of course, the file versioning system.
Also interested in the version of the Bitrix admin panel and the database.
Thanks in advance.

Answer 1

1. Committing on combat - well, this is ... a shitty idea in general. If you really need to do this: make an edit, then commit it to the repository as a separate commit (NOT from the sale), and delete local changes on the production one.
2.

We are developing on a test one - I would like to send all changes as a commit, without thinking and without remembering what needs to be transferred.

Actually, for this you need VCS))
In general, I recommend git - like VCS AND git flow as a branch management process.
At the same time, I recommend allocating a separate server for a common repository (although with your scheme, you can directly raise the repository to dev).
I also highly recommend looking towards gitlab (if the code is covered by tests, or if it is planned - gitlab-ci).
Nothing prevents you from raising the same gitlab, for example, to DO .