Was ist Trunk-Based Development und wie unterstützt es CI/CD?

Question

Accepted Answer

**Trunk-based development** ist eine Branching-Strategie, bei der Entwickler kleine Änderungen **häufig in einen einzigen Hauptzweig (Trunk) integrieren**, wobei sie sehr kurzlebige Branches verwenden (oder direkt committen). Es ist stark mit hochperformantem CI/CD verbunden, da es kontinuierliche Integration maximiert.

## Was Trunk-Based Development ist

```text
Developers commit small, frequent changes to a SINGLE shared branch (trunk/main):
  → very SHORT-LIVED branches (merged within hours or a day) — or commit directly
  → integrate continuously (multiple times a day) into trunk
  → trunk is kept always RELEASABLE (working, deployable)
→ vs long-lived feature branches that diverge for days/weeks before merging.
```

## Warum es CI/CD gut unterstützt

```text
✓ MAXIMIZES continuous INTEGRATION — frequent small merges = the essence of CI
  (catch integration issues immediately; tiny, easy-to-resolve conflicts)
✓ AVOIDS "merge hell" — no long-lived branches diverging → no big painful merges
✓ Small changes = lower risk, easier review, faster feedback
✓ Keeps trunk always deployable → enables continuous DELIVERY/deployment
→ Research (DORA) links trunk-based development to high delivery performance.
```

## Umgang mit unvollständiger Arbeit

```text
How to commit to trunk frequently when features aren't done?
  ✓ FEATURE FLAGS → merge incomplete features hidden behind off flags (don't break trunk)
  ✓ Break work into small, independently-mergeable, non-breaking pieces
  ✓ Branch by ABSTRACTION → introduce changes incrementally behind abstractions
→ The discipline: integrate small, keep trunk working, hide incomplete work.
```

## Trunk-Based vs Feature-Branch (Git Flow)

```text
TRUNK-BASED → short-lived branches, frequent integration, continuous delivery,
  feature flags — favored for high-velocity CI/CD
GIT FLOW (long-lived branches) → more structured, release-oriented, but longer
  divergence and bigger merges → less continuous
→ Trunk-based is generally preferred for true CI/CD; Git Flow for scheduled releases.
```

## Warum es wichtig ist

Das Verständnis von Trunk-Based Development ist wertvoll als Know-how auf Senior-Level, da es **stark mit hochperformantem CI/CD verbunden ist** und eine wichtige Branching-Philosophie darstellt, weshalb es für das Verständnis effektiver Delivery-Praktiken nützlich ist.

Die Kernidee — Entwickler integrieren **kleine Änderungen häufig in einen einzigen Trunk** mit sehr kurzlebigen Branches (anstelle von langlebigen Feature Branches, die sich über Tage oder Wochen auseinander entwickeln) — maximiert direkt **kontinuierliche Integration**, was das Wesen von CI ist: häufige kleine Merges erkennen Integrationsprobleme sofort und erzeugen kleine, leicht zu behebende Konflikte, **vermeiden das „Merge Hell