root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(KB-170): handle worktree cleanup after merge retries exhausted

Browse Source 
- Add mergeRetries counter to track per-task retry attempts
- Auto-resolve lock files and generated files during retry attempts
- Clean up worktree when all 3 merge retry attempts are exhausted
- Add comprehensive tests for retry cleanup logic in executor
- Add changeset for the worktree retry cleanup fix
This commit is contained in:
gsxdsm
2026-03-30 10:50:43 -07:00
parent 4b919fb732
commit 702361eafc
3 changed files with 124 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/fix-worktree-retry-cleanup.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@dustinbyrne/kb": patch
---
Automatically clean up a conflicting git worktree and retry creation when rerunning a failed task hits the "branch is already used by worktree" error.