Repository navigation

Add headless overwrite semantics to merge_conflicts and the merge CLI verb - #28

Merged

TheValiantOne merged 2 commits into

mainfrom

feature/headless-overwrite

Aug 11, 2026

Commits on Aug 11, 2026
- Add headless overwrite semantics to merge_conflicts and the merge CLI verb
  
  authored and
  Chris Knight
  committed
  a364b1d
- Merge remote-tracking branch 'origin/main' into feature/headless-overwrite
  
  Chris Knight
  authored and
  Chris Knight
  committed
  251a239