trunk-based development भनेको के हो र यसले CI/CD लाई कसरी समर्थन गर्छ?

Question

Accepted Answer

**Trunk-based development** एक branching strategy हो जहाँ developers छोटा परिवर्तनहरू **बारम्बार एकै मुख्य branch (trunk) मा integrate गर्छन्**, धेरै छोटो-अवधि को branches प्रयोग गरेर (वा सीधै commit गरेर)। यो उच्च-कार्यसम्पादन CI/CD सँग दृढ रूपमा जोडिएको छ किनभने यसले continuous integration लाई अधिकतम गर्छ।

## Trunk-based development भनेको के हो

```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.
```

## यसले CI/CD लाई किन राम्रोसँग समर्थन गर्छ

```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.
```

## अधूरा काम सम्भालना

```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 बनाम 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.
```

## यो किन महत्त्वपूर्ण छ

Trunk-based development बुझ्नु मूल्यवान senior-level ज्ञान हो किनभने यो **उच्च-कार्यसम्पादन CI/CD सँग दृढ रूपमा जोडिएको छ** र एक महत्त्वपूर्ण branching दर्शन प्रतिनिधित्व गर्छ, त्यसैले यो प्रभावकारी delivery practices बुझ्नको लागि उपयोगी छ।

मूल विचार — developers **एकै trunk मा छोटा परिवर्तनहरू बारम्बार integrate गर्दछन्** धेरै छोटो-अवधि को branches प्रयोग गरेर (लामो-अवधि को feature branches को सट्टा जो दिनहरू वा हप्ताहरूको लागि भिन्न हुन्छन्) — सीधै **continuous integration लाई अधिकतम गर्छ**, जो CI को सार हो: बारम्बार साना merges ले integration समस्याहरू तुरुन्तै पकड्छन् र साना, सजिलोसँग समाधान गर्न सकिने conflicts उत्पादन गर्छन्, **लामो-भिन्न branches को