What workflow for Chef do you use in teams?

Hello there,

I've started using Chef about two months ago and I definitely think it's a great tool. But there is a problem that I've been wondering about for a while now. And that is how to maintain your infrastructure using Chef when there are multiple sysadmins using it?

At the moment it's only me and my fellow sysadmin, so the situation is not that bad. We develop our changes in separate git branches(as the whole configuration is in one repo for all chef related things) and review/merge them for each other, but we've certainly noticed situations in which we had problems working at the same time.

I'm mostly referring to the fact that changes made and uploaded to the chef-server by one sysadmin might be unwanted and/or cause errors for another sysadmin testing his changes on another server by running chef-client.

From what I've gathered during my short research is that the predominantly preferred solution is running two Chef servers. One for use with your actual infrastructure, and another for development. That sounds like a good idea but I've wondered if there are any other methodologies people use when working with chef in teams.

Thanks in advance for any and all suggestions!