What is the right git workflow with shared feature branches?

Question

Say I have a branch named feature that has been branched off master. Both, developer1 and developer2 checkout feature. developer1 comm

Answer 1

the third developer should not be writing a feature on master. The rare exception is a hotfix. But even then, it should be it's own branch then merged with --no-ff onto master. I've written a long post about branch per feature here: http://dymitruk.com/blog/2012/02/05/branch-per-feature/