12 Lecture

Question 1

Explain the simple branching Model

Answer 1

3 Branches:

• Master Branch: External Release (e.g. Product Increment)
• Development Branch: Promotions that can be used as internal release
• Feature Branches: incremental development and explorations

Question 2

What is a branching model

Answer 2

A branching model controls the concurrent development and defines rules for creating and merging (promotions) branches

Question 3

Which branches are in the Git-flow Branching Model

Answer 3

• Master Branch: (Contains Potentail Product Increments)
• Hotfix Branches: (Commits for revisions)
• Release Branches: (prepare releases contan bugfix commits)
• Development Branches: (contains finished features for internal release)
• Feature Branches: incremental development and explorations)

Question 4

What is the Broken Window Theory?

Answer 4

A broken window turns very quickly clean, intact, inhabited buildings into a smashed and abandoned derelict.

Question 5

What are the best practices for branch and merge management?

Answer 5

• Uses branches to control concurrent development and exploration
• Agree on a workflow (branching model)
• Map backlog items to feature branches
• Only one person at once works with non merge-able files

Question 6

How long should a feature branch stay open and why

Answer 6

Only some days

Otherwise, merge conflicts

Question 7

What is feature toggle

Answer 7

Only one branch and review each commit

Use of feature toggles to activate features when finished