Dbochman/merge-and-doc
.claude/skills/merge-and-doc/SKILL.md
Merge a PR and update documentation in one workflow. Use when: (1) Ready to merge a PR and want to update roadmap/changelog, (2) Need to verify merge success before documenting, (3) Want atomic merge + doc commits. Handles gh pr merge, verification, kanban updates, and session notes in sequence.
$ install --global
skillsauthnpx skillsauth add Dbochman/dotfiles merge-and-docInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 17, 2026, 1:49 AM6.0s1 file scanned
SKILL.md
- name:
- merge-and-doc
- description:
- |
- Merge a PR and update documentation in one workflow. Use when:
- (1) Ready to merge
- author:
- Claude Code
- version:
- 1.0.0
- date:
- 2026-02-04
- user_invocable:
- true
Merge and Document Workflow
Problem
Merging PRs and updating documentation are separate steps that often get interrupted mid-way, leaving docs out of sync with merged code. Sessions end after the merge but before the roadmap or changelog gets updated.
Context / Trigger Conditions
- User says "merge PR #X" or "merge and doc"
- PR is approved and ready to merge
- Want to ensure documentation is updated atomically with the merge
Solution
Step 1: Verify PR Status
gh pr view <PR_NUMBER> --json state,mergeable,reviews,title,body
Check that:
- State is OPEN
- Mergeable is true
- Has at least one approving review (or user explicitly overrides)
Step 2: Merge the PR
gh pr merge <PR_NUMBER> --squash --delete-branch
Use --squash by default (per project conventions). Add --admin if user has rights and wants to bypass checks.
Step 3: Verify Merge Success
git fetch origin main
git log --oneline -1 origin/main
Confirm the merge commit appears and matches the PR title.
Step 4: Update Local Main
git checkout main
git pull origin main
Step 5: Update Documentation
Based on the PR content, update relevant docs:
For feature PRs:
# Move kanban card to changelog
npm run kanban:move -- --board=roadmap --card=<card-id> --to=changelog
npm run precompile-kanban
For bug fixes:
- Add entry to session-notes.md if notable
- Move related kanban card if exists
For all PRs:
- Check if ROADMAP.md needs updating
- Check if any related cards need status changes
Step 6: Commit Documentation Updates
git add .
git commit -m "docs: update roadmap after PR #<NUMBER> merge
Moved <card-name> to changelog.
Co-Authored-By: Claude Opus 4.5 <[email protected]>"
git push origin main
Arguments
| Argument | Required | Description |
|----------|----------|-------------|
| PR number | Yes | The PR to merge (e.g., 123 or #123) |
| --admin | No | Bypass branch protection (requires admin rights) |
| --no-doc | No | Skip documentation updates |
Example Usage
/merge-and-doc 215
/merge-and-doc #215 --admin
/merge-and-doc 215 --no-doc
Verification
After completion:
- PR shows as merged on GitHub
- Local main is up to date with remote
- Kanban board reflects the change (if applicable)
npm run precompile-kanbanpasses validation
Error Handling
PR not mergeable:
- Show the blocking reason (failing checks, conflicts, missing reviews)
- Ask user if they want to proceed with
--adminor fix issues first
Merge fails:
- Show error message
- Do NOT proceed to documentation updates
- Suggest
gh pr viewto diagnose
Doc update fails:
- Complete what's possible
- Report which updates failed
- Leave user with actionable next steps
Notes
- Always use
--squashmerge per project conventions - Delete branch after merge (keeps repo clean)
- If no kanban card exists for the PR, skip kanban updates
- Session notes are optional—only add if the work was notable
- This skill follows the project's Git Workflow from CLAUDE.md
Related Skills
Dbochman/reolink-camera
tools
VerifiedTrustedCommunity
Use exact configured Reolink cameras through the local Home Hub for availability and power status, fresh stills, visual commentary, protected Dylan/Julia/household sharing, and reversible spotlight control. Supports trusted owner tasks and explicitly scoped proactive automations; not for Nest or Ring cameras, arbitrary recipients, recordings, account changes, or raw camera APIs.
2SKILL.mdUpdated Jul 28, 2026
Dbochman/plant-tracker
data-ai
VerifiedTrustedCommunity
Privately manage Dylan and Julia's household plant inventory and care history by physical location, bed, and exact Flower Cam view. Use for confirmed plant onboarding from camera conversations, camera- or bed-filtered inventory, record corrections, individual or whole-bed care, and private filtered exports. Pair with reolink-camera when an owner asks about plants visible in Flower Cam images.
2SKILL.mdUpdated Jul 28, 2026
Dbochman/reachy-control
testing
VerifiedTrustedCommunity
Inspect and control the physically secured Reachy Mini at Crosstown through ClawBody. Use for requests to check Reachy, look around, express an emotion, play any official emotion or dance preset, speak proactively, mute or unmute its microphone, stop movement, or describe what its camera sees.
2SKILL.mdUpdated Jul 16, 2026
Dbochman/reachy-continuity
tools
VerifiedTrustedCommunity
Handle Reachy/iMessage handoffs, selective durable memory, forgetting, and diagnostics; automatic context comes from the gateway plugin.
2SKILL.mdUpdated Jul 16, 2026