How in my case to build work with a remote GIT repository?

Question

git

There is a server. There is a working version of the site + next to the git repository. On the local PC, too, git.
I want to get the following:
1. I work on a local PC, I pushed it to the server, everything was updated there (both git and site files).
2. I went straight to the working site. I made changes directly to the files and then transferred / pulled these changes to the local version.
What I tried:
- Remote server with bare repository. I can send files from the local version and they will change the files on the server (hooks). But if I fix something on the server with my hands, then I can’t track / pull / fix these changes.
- Remote server with standard repository. I can fix edits on the server, I can pull them off for myself. But I can't push to the server.
There are some doubts that this is possible (2 point desired). I will be grateful for your help!

Answer 1

The second option, automatic deployment is solved through DeployBot or a similar service.
https://deploybot.com/
ftploy.com
https://buddy.works/
Self-hosted:
https://deployer.org/
applikatoni.com
Well, in general, it is possible through continuous integration.

Answer 2

1. It's a bad idea to edit something manually on the server!
2. You should always have a test bench (except for the sale and locale)
In most cases, we work like this with the locale a separate branch, further or in develop or master.
Assembly via JENKINS if something is changed by hand on the server - DO NOT COLLECT well and + tests