I'm a lead developer for a small company and I've recently came across a way to implement version control (git) on our workflow because the company is growing. In terms of infrastructure we have a couple of "production" servers, a development(accessible over the internet) server and an internal development server with internet access but blocked by a hardware firewall. Our current workflow consists of:
- init a repo inside the production server with the proper .gitignore for that project and do the initial commit
- push that commit to a bare repo inside the development server
- clone the repo from the development server to the internal development server
- make a network share on samba on the internal developlemt server so other network computers (we are all running windows) can connect to it.
I know for sure that this is a bit too complicated, but we want to try out git and make the workflow as easy as possible.
I've been reading about git-flow and stuff but so far I've been unable to get the workflow just right, I think that having the two development servers adds some redundancy.
Can someone share any tips on how to improve this workflow?