Branching strategies
On This Lesson 4 topics
This lesson is planned. The outline below lists the topics it will cover. The full lesson has not been published yet.
In this lesson
pick a branching approach that keeps merging easy.
Planned topics
- Trunk-based development: everyone merges small changes to
mainat least daily; unfinished features hide behind a feature flag. - Short-lived feature branches: branch from
main, merge within a day or two via a pull request. - Long-lived branches cause painful merges; avoid them.
- Name branches clearly:
feature/cart-discount,fix/order-total. - Keep
mainalways releasable; CI protects it.
Draft outline details
Demonstration
a drawing: main with short branches merging back within a day, versus a branch alive for three weeks.
Check your understanding
Why avoid long-lived branches?
Show answer
They drift from main and cause large, risky merges.
Practice
Apply this lesson with the module's lab, exercises and quiz.
Marking a lesson complete is optional and you can undo it any time. Your progress stays in this browser.