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

feat(KB-010): add autoResolveConflicts setting with intelligent merge conflict resolution

Browse Source 
- Add autoResolveConflicts setting to types and store (default: true)
- Implement smart conflict detection for lock files and generated files
- Add 3-attempt retry logic with escalating strategies to merger
- Auto-resolve lock files using 'ours', trivial whitespace conflicts
- Track mergeRetries per task for retry loop management
- Update AGENTS.md with conflict resolution documentation
- Add comprehensive merger tests for retry scenarios
This commit is contained in:
gsxdsm
2026-03-29 18:27:23 -07:00
parent 234f568e12
commit ddaf73554b
9 changed files with 1642 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/auto-resolve-merge-conflicts.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@dustinbyrne/kb": minor
---
Add automatic merge conflict resolution for auto-merge. When enabled, the system will intelligently auto-resolve lock files and generated files, and retry failed merges with escalating strategies (AI → auto-resolve → merge -X theirs).