fix: remove merge conflict artifacts from meta SKILL.md files#34
Merged
KyleAMathews merged 3 commits intomainfrom Mar 5, 2026
Merged
fix: remove merge conflict artifacts from meta SKILL.md files#34KyleAMathews merged 3 commits intomainfrom
KyleAMathews merged 3 commits intomainfrom
Conversation
The previous merge left conflict markers in all three meta skill files (domain-discovery, generate-skill, tree-generator). Resolved by keeping the HEAD (intent) versions and removing the duplicate playbooks content. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
commit: |
KyleAMathews
force-pushed
the
fix/resolve-merge-conflicts
branch
from
d1ed3d7 to
32e75c7
Compare
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
KyleAMathews
added a commit
that referenced
this pull request
Mar 5, 2026
…lls/_artifacts in monorepos Restore content accidentally removed in PR #34's merge conflict resolution: - Hard rules section enforcing mandatory interactive interviews - STOP gates after Phase 1c, 2e, 3i - Interactive phase headings and preambles for Phases 2 and 4 - Expanded rules for Phases 2 and 4 (open-ended questions, wait for response) - Monorepo cross-package question in Phase 2a - Phase 3 docs file listing preamble - packages field in domain_map.yaml schema - Additional constraints table rows (interview interactivity, STOP gates, etc.) - Cross-model compatibility notes about STOP gates and hard rules Also fix !skills/_artifacts to only be added in non-monorepo packages, since in monorepos _artifacts lives at repo root. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
LadyBluenotes
pushed a commit
that referenced
this pull request
Mar 5, 2026
* feat: split setup into focused commands and improve meta skills Replace `intent setup` with three focused commands: - `intent add-library-bin` — generates the bin/intent bridge file - `intent edit-package-json` — wires package.json for skill publishing - `intent setup-github-actions` — copies CI workflow templates Improve meta skill SKILL.md files based on real scaffolding feedback: - Soften lightweight path threshold and narrative guide reading - Add companion library and experimental features questions - Add YAML validation step in domain discovery - Add subagent guidance and review cadence preference in generate-skill - Replace inline feedback sections with pointer to feedback-collection - Update tree-generator to reference edit-package-json command Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: add changeset Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * ci: apply automated fixes * fix: resolve TS2532 in indentMatch optional group access Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: restore hard rules and STOP gates in domain-discovery, skip !skills/_artifacts in monorepos Restore content accidentally removed in PR #34's merge conflict resolution: - Hard rules section enforcing mandatory interactive interviews - STOP gates after Phase 1c, 2e, 3i - Interactive phase headings and preambles for Phases 2 and 4 - Expanded rules for Phases 2 and 4 (open-ended questions, wait for response) - Monorepo cross-package question in Phase 2a - Phase 3 docs file listing preamble - packages field in domain_map.yaml schema - Additional constraints table rows (interview interactivity, STOP gates, etc.) - Cross-model compatibility notes about STOP gates and hard rules Also fix !skills/_artifacts to only be added in non-monorepo packages, since in monorepos _artifacts lives at repo root. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * ci: apply automated fixes --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
domain-discovery,generate-skill,tree-generator)intent) versions, removed the staleplaybooksduplicatesTest plan
<<<<<<<,=======,>>>>>>>) remain in the repointentcontent🤖 Generated with Claude Code