Skip to content

feat: configurable conflict resolver for rebase conflicts - #146

Merged
msiemens merged 4 commits into
msiemens:masterfrom
abersnaze:conflict-resolver
Aug 10, 2026
Merged

feat: configurable conflict resolver for rebase conflicts#146
msiemens merged 4 commits into
msiemens:masterfrom
abersnaze:conflict-resolver

refactor: drop {prompt} templating, wire resolver into worktree path

9ce6f1b
Select commit
Loading
Failed to load commit list.
Sign in for the full log view
MinGW (MSYS2)
succeeded Aug 10, 2026 in 4m 7s