To use GIT started a couple weeks ago, goal is a version control system.
Made this statement https://github.com/eveness/git-and-timeweb
The problem is that I used to edit project files in Sublime Text
and directly via SFTP to change them on the server
when I see that everything is done as needed, doing add + commit locally
and send it to the server, but since files have been modified directly on the server, a conflict occurs.If you edit the files locally
and send changes only after add + commit
the conflict there
That would work so it is necessary to raise a local web server, and it is not convenient.
Tell me, how do you work with projects?
It is important to me that you could edit the files on the server directly, and have the opportunity to committing the changes locally.With the site running at the same time strictly one person.