Clarified the git/branch workflow (at least I hope so)