Git and Branch-per-feature

Very useful pro-git book: http://progit.org/book/

 

 

Notes:

@nvie (twitter) - has a good gitflow article (http://nvie.com/archives/438)

git merge --no-ff (for merging onto an unchanged master)