fix(FN-2065): log final merge cleanup reset failures

- Log final-path git reset --merge cleanup failures in aiMergeTask with task-scoped warning details
- Preserve the original "all 3 attempts exhausted" merge error even when cleanup reset fails
- Add merger retry tests covering successful final cleanup and failed final cleanup logging behavior
- Add a patch changeset for @gsxdsm/fusion documenting the improved merger diagnostics
This commit is contained in:
Fusion
2026-04-18 16:39:34 -07:00
committed by gsxdsm
parent 5f04cf05b2
commit 8435b685cf
3 changed files with 88 additions and 2 deletions

View File

@@ -0,0 +1,5 @@
---
"@gsxdsm/fusion": patch
---
Improve merger diagnostics by logging final `git reset --merge` cleanup failures after all AI merge attempts are exhausted.