premise, I develop sites with the Kohana php framework (it was used before my hiring in the company, I hate it!) and from the next I will start using Laravel. And I would like to use git and delete filezilla from my workflow.
I finally managed to get the choice on the framework to use, and I was given the freedom to use other technologies, as long as they don't alter too much the usual workflow we have had up to now.
So we would have this situation (i tried to show it in the cover image)
- I work in the office with a macbook, at home with a desktop with windows 10.
- My boss is not a developer, but he is the html and css designer. he needs to keep uploading and downloading individual site files via ftp with filezilla.
- We have our own server running with ubuntu
I would like to use git for the deployment, but need it not to conflict with my boss's filezilla uploads.
is it possible to do this with git? could there be conflicts? do you have alternative solutions to recommend? or advice on how to set up git for my needs? I took a first look at git-ftp, can it be a viable solution for me?
thank you all for your attention :)
PS: sorry if my english is not perfect. I'm italian and english is not my native language