Git Workflow Best practices

Question

Stupid question and treat me as completely a newbie to version control.

I\'m new to Git (I\'ve used subversion before, but just the basics) I understand the basics of G

Answer 1

John should work on master, Eric should work on a branch named WYSIWYG or some branch named appropriately.

If you want to checkout what could be version 1.3 you should push John's master branch to a new branch called stable if you don't have it already, if you do have a stable branch already, simply merge master into stable again, this would be done each time you want to release some bug fixes.

If Eric is finished on the wysiwyg branch, merge that in as well and then you have your compilable release. you then archive/destroy/ignore the wysiwyg branch as it is no longer needed.