09 Software Configuration Management

Question 1

Which branches are in the simple branching model?

Answer 1

• Master Branche: External Release
• Development Branche: Promotions that can be used as internal release
• Feature Branches:

Question 2

Which branches are there in git flow Branch Management

Answer 2

• Master Branch
• Hotfix Branches (revisions)
• Development Branch
• Feature Branches

Question 3

What is a revision

Answer 3

only contains fixes

Question 4

Best practices for branch and merge management

Answer 4

• Use branches to control concurrent development and explorations
• Agree on a workflow (branching model)
• Map backlog items / requirements to feature branches (workflow automation)
• Only one person at once works with non merge-able files
• Important: Minimize feature branch lifetime (not more than “some” days)