Skip to content

(resolve) merge conflict #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tonmoy007 merged 8 commits into from
Aug 2, 2026
Merged

(resolve) merge conflict #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6020aa1
fix(ci): remove literal ${{ }} from release.yml run-block comment
tonmoy46 Jun 24, 2026
880e598
Merge pull request #49 from tonmoy007/fix/release-yml-empty-expr
tonmoy007 Jun 24, 2026
5a2d054
fix: restore SRS behavioral requirement markers (#57)
tonmoy007 Aug 2, 2026
74e35e8
Merge branch 'main' of github.com:tonmoy007/forge-plugins into develop
tonmoy46 Aug 2, 2026
604d835
(merge) conflict resolve
tonmoy46 Aug 2, 2026
29816af
(merge) conflict resolve
tonmoy46 Aug 2, 2026
cb658dc
resolve(conflict)UPDATE WITH MAIN AND MET MERGE CONFLICT
tonmoy46 Aug 2, 2026
69f1ed0
resolve(conflict)UPDATE WITH MAIN AND MET MERGE CONFLICT
tonmoy46 Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions agents/requirements-analyst.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ You MUST NOT:

<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 849ad8e53279082e5d59e7e68f30f236f49900c1
When the project description is incomplete:

Conduct a single bounded round before writing `pipeline/01-srs/srs.md`.
Expand Down
5 changes: 0 additions & 5 deletions skills/forge-srs/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,9 @@ allowed-tools: [Read, Write, WebSearch, WebFetch, Grep]
2. Adopt that persona completely — you are now the Requirements Analyst.
3. Ask the user to describe their project if they haven't already. Gather: what the system does, who uses it, key constraints (technology, timeline, compliance).
4. Follow the Requirements Analyst workflow: clarify, categorize, assign REQ-IDs, write acceptance criteria.
<<<<<<< HEAD
5. Write `pipeline/01-srs/srs.md` per the Output Contract in the persona file.
6. Run `python3 ${CLAUDE_PLUGIN_DIR}/scripts/state-manager.py advance --to 1` to mark Stage 1 active.
=======
5. Conduct a single bounded round of clarification questions (REQ-INTERACTIVE-CLARIFY-001) before writing `pipeline/01-srs/srs.md` — one batch, not a drip. Unanswered questions become documented assumptions in the SRS.
6. Write `pipeline/01-srs/srs.md` per the Output Contract in the persona file.
7. Run `python3 ${CLAUDE_PLUGIN_DIR}/scripts/state-manager.py advance --to 1` to mark Stage 1 active.
>>>>>>> 5a2d054873ab85c3b8590120b883ff3fcfc97f3a

## Verification

Expand Down
Loading