Deploying with Git/Github

Question

We are trying to setup an automated deployment environemt with Git/Github. We have 3 different environments; local, test and live. When we add a new feature on local, we first u

Answer 1

Whether or not git is the right choice, is a good question.

But if you're going to do it you should read through the gitworkflows manual page. Specifically, what it'll recommend and what sounds right given your problem above is that you need to put each separate "thing" to be developed into a topic/feature branch, and then merge that branch into the right tree when its done. That lets you separate out things so that you merge what is needed and stable and don't merge what isn't.