Tom Boucher 571b382075 fix: clean up MERGE_HEAD on all error paths in mergeMilestoneToMain (#2912) (#3068) ... libgit2's merge implementation creates MERGE_HEAD even for squash merges, unlike CLI git. When the merge fails with conflicts, the error paths in mergeMilestoneToMain cleaned SQUASH_MSG and MERGE_MSG but left MERGE_HEAD on disk. This blocked all subsequent merge attempts and caused doctor to report corrupt merge state. Add MERGE_HEAD cleanup (via nativeMergeAbort + explicit unlink) to: - The code-conflict error path (before MergeConflictError throw) - The dirty-working-tree error path (defensive) - The success path (alongside existing SQUASH_MSG cleanup) Closes #2912 Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>		2026-03-30 14:43:02 -06:00
..
agents	fix: replace web_search with search-the-web in prompts and agent frontmatter (#2920) (#3245)	2026-03-30 14:30:01 -06:00
extensions	fix: clean up MERGE_HEAD on all error paths in mergeMilestoneToMain (#2912) (#3068)	2026-03-30 14:43:02 -06:00
skills	fix(docs): use ~/.pi/agent/extensions/ for community extension install path (#3131) (#3259)	2026-03-30 13:50:25 -06:00
GSD-WORKFLOW.md	feat: meaningful commit messages from task summaries (#803)	2026-03-16 23:30:33 -06:00