실무에서 검증된 디자인, 개발, AI workflow 강의를 제공합니다.

# Branching Basics
A branching strategy is the shared agreement that reduces conflicts and keeps deploys stable when many people edit the same codebase at once.

## Why not commit straight to main?
Because main should always stay deployable. Features are built on a separate {tip:branch}(an independent line of work split off at a point in time), reviewed, then merged.

### How small should a feature branch be?
Ideally small enough to hold one purpose and merge within a few days. The longer a branch lives, the further it drifts from main, raising conflict and review costs.

## How do merge and rebase differ?
Merge creates a new commit joining two histories; rebase moves your commits on top of main, rewriting history into a straight line. Merge is usually safer for shared branches.

### When should you avoid rebase?
Rebasing a branch already shared (pushed) with others rewrites history and causes conflicts for collaborators. So rebase is usually limited to local branches only you use.

Keeping main safe, the difference between merge and rebase, and the everyday habits that reduce conflicts — learned through questions.