As rbrtsmith says you shouldn't try and use Git and FTP as this will cause errors when you deploy.
If you are making minor changes to the CSS etc then are you doing this locally before deploying it?
Well the plan is to make the changes and have Beanstalk deploy the changes to the live site once it's tested so shouldn't need to touch the ftp.
In response to your question, that's the trouble I'm having understanding.
At the moment the set up is this:
Test/Development Server (internal access only)
Live/Production Server (public facing)
When a change is requested, I connect to the dev server via ftp, download the files to change, work on them and upload back to dev server. And so on until I've done whatever I was asked to do. Then that server is checked and if everything is okay, I tell someone what files changed, they take them from the dev server and upload to the live server.
We only have access to the front end (templates, js, css, etc). All heavy backend stuff is managed by a third party and isn't accessible nor is it possible to have a local (my machine) version because it's managed by a third party.
So, how am I supposed to work on the dev server if git is in the way and everything needs to be pushed to the dev server again and again? This is why I think I may have a misunderstanding on the process. I work for a company as big as Argos, New Look, etc. I am sure they have version control though.
What I had hoped to have set up is this:
*(insert bit I don't get, lets pretend I do have a local version)* I make the changes as requested, those are then pushed to the dev server. Once it's tested and signed off, those changes are pushed and merged with the live server code and Beanstalk takes care of deployment to the live server.
So that bit in *(...)* is where, as I understand it, is where a local version should be. But as this is not possible, how do other companies do it? I should mention the third party that handles the back-end of the site also manages other well known big brand sites too, at least some of them must have version control set up...
It's getting very annoying and I can't find answers anywhere