Adding instructions for branch management during the release process and during development work.
improvements based on review
more revisions based on review
Explaining how to merge changes under different situations.
typo fix
Merge pull request #235 from pulp/mhrivnak-branching

Adding instructions for branch management during the release process and...