World map

 

BM

World 6: Team Workflows

Trunk-based and feature flags

You will learn: how teams merge tiny changes every day and hide unfinished work.

The problem

Tap each point on the timeline.

Your branch lived for six weeks. Main did not wait for you. Tap to see how merge day went.

Watch

In trunk-based development: Everyone merges small changes into main (the trunk) at least once a day., everyone merges tiny changes into main. Often. At least once a day. Main is called the trunk.

Try it

Half-built work can merge too, switched off. A feature flag: An on/off switch in your code that hides unfinished work. is an on/off switch in your code. Tap the line that checks it.

Tap the line that checks the switch.

0 of 1 found

Try it

Ship it switched on, or hide it behind a flag?

Drag a card into a box. Or tap the card, then tap the box.

      Predict

      The new checkout is in main. Its flag is off. A customer pays. What do they see?

      Check

      Good trunk-based habit? Swipe right if yes, left if not.

      Swipe right for good, left for needs work. Or use the buttons.

      1 / 5

      Merge into main at least once a day

      You did it!

      You can now explain trunk-based development and feature flags.

      Go deeper (optional)

      Very small teams may commit straight to main. Bigger teams use tiny branches and quick PRs. A merge queue helps busy repos. It tests each PR with the latest main, then merges it. Flags can also switch a feature on for a few users first.