Daily Workflows

Short branches, fast merges

Trunk-Based Dev

Concept

Everyone works on short-lived branches off main: • Branches live <2 days • Feature flags over long branches • CI on every push

Reduces merge conflicts dramatically.

Challenge

Create short-lived branch and push

WorkshopSimulated · no real damage

Terminal~/project·main

Idle

Working treemain

Not a git repository. git init to start.

Commit graph

main

Commits will appear here.

Each command rewrites this graph in real time.