best practices for version control/branching/feature development?

Please note that you can merge any notebook into any other notebook, regardless of their relationship (or parent author). See this comment for the detailed steps: