Menu
Resolve state conflicts using 4 deterministic strategies (accept ADO, push local, manual merge, retry)
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Generate Sprint Stories from Master Story + sprint scope โ ADO-ready PRD lift, UI/Figma, non-redundant sections
Generate Master Stories (feature-level) from PRD โ for Sprint Stories use sprint-story-generator; for tech tasks use tech-task-generator
Understands natural English language queries and converts them to SDLC commands. Supports hybrid pattern matching + AI understanding. Asks for ADO work item if missing, shows non-closed items for quick selection. Works with any stage, any role.
One-command setup for AI-SDLC IDE Plugin. Installs dependencies, creates env, bootstraps .sdlc/, wires Claude Code commands, Cursor MCP, and validates everything.
Security validation for Java/TEJ/Spring backend code
Backend developer skill for Java 17, TEJ, RestExpress, Kafka, Gradle, PostgreSQL
| name | conflict-resolution |
| description | Resolve state conflicts using 4 deterministic strategies (accept ADO, push local, manual merge, retry) |
| model | sonnet-4-6 |
| token_budget | {"input":6000,"output":3000} |
Applies conflict resolution strategies to synchronize local SDLC memory with Azure DevOps state.
When: External changes from other team members Actions: Update local to ADO, pull comments/metadata Outcome: Local memory aligns with ADO (ADO wins)
When: Local represents intended progress not yet in ADO Actions: Queue local changes for push, override ADO on next push Outcome: ADO will be updated on next push cycle
When: Both have valid, non-conflicting information Actions: Display side-by-side, allow user to select fields Outcome: Merged state in both systems
When: Temporary ADO unavailability Actions: Activate offline mode, queue sync for retry Outcome: Deferred sync, no blockage
Presents conflict with options:
.sdlc/memory/{story-id}/state.json - conflicting fields.sdlc/state.json - memory_synced_at timestamp.sdlc/sync-log.json - resolution operation log.sdlc/pending-sync.json - offline operationsSDLC_SYNC_TIMEOUT_SECONDS=30
SDLC_AUTO_RESOLVE_ARTIFACTS=true
SDLC_OFFLINE_RETRY_INTERVAL=1800
SDLC_CONFLICT_MODE=alert
Use this skill when: