singularity-forge/src/resources
Jeremy McSpadden 00438b2bb4 fix: skip redundant checkout in worktree merge when main already current (#757)
When mergeMilestoneToMain runs from a worktree context, main is already
checked out at the project root. The unconditional git checkout main
fails with "already used by worktree" because git refuses to checkout a
branch that is active in another worktree.

Skip the checkout when the integration branch is already current at the
project root, which is always the case in worktree-mode merges.
2026-03-16 20:24:24 -05:00
..
agents fix: type errors in claude-import.ts and marketplace-discovery.ts 2026-03-16 14:46:31 -04:00
extensions fix: skip redundant checkout in worktree merge when main already current (#757) 2026-03-16 20:24:24 -05:00
skills feat: add MCP server mode, /lint skill, E2E smoke tests 2026-03-16 13:56:31 -05:00
GSD-WORKFLOW.md docs: sync GSD workflow resource (#476) 2026-03-15 18:23:52 -06:00