Repository navigation

feat: configurable conflict resolver for rebase conflicts - #146

Merged

msiemens merged 4 commits into

msiemens:masterfrom

abersnaze:conflict-resolver

Aug 10, 2026

Commits on Aug 6, 2026
- feat: add configurable conflict resolver for rebase conflicts
  
  authored and
  George Campbell
  committed
  bea6089
- docs: add rebase.conflict-resolver to README
  
  authored and
  George Campbell
  committed
  cc775f9
- fix: drop dead suppress_pop mechanism from stasher
  
  abersnaze
  authored and
  George Campbell
  committed
  1bfded2
Commits on Aug 9, 2026
- refactor: drop {prompt} templating, wire resolver into worktree path
  
  abersnaze
  authored and
  George Campbell
  committed
  9ce6f1b