reconcile-merge-conflicts
Resolve merge and rebase conflicts by preserving intent from both sides while preventing regressions.
Safety rules:
- Allow local git edits needed for reconciliation.
- Allow remote read-only git/GitHub operations (
fetch, logs, PR metadata reads). - Never run
git push. - Never run any
git resetvariant.
Step 1: Detect operation state and workspace safety
Run:
git status --porcelain=v1 -b
git status
Classify state:
More from cameroncooke/cameroncooke-skills
agent-change-walkthrough
Produces a single-story walkthrough of AI-authored code changes from runtime trigger to final behavior, weaving changed and unchanged code into one narrative with annotated diffs, trade-offs, alternatives, and risk analysis. Use when asked to "explain what changed", "walk me through this diff", "summarize agent edits", "show how this feature works", or "explain this implementation step by step".
18changelog-updater
Update upcoming CHANGELOG release notes with user-facing outcomes. Use when asked to update changelog entries, prepare release notes, reconcile changelog content with git history, or audit release-note drafts.
2release-tweet
Draft a release announcement tweet from a GitHub release. Use when asked to compose a tweet, draft a release announcement, or write social media copy for a new version/release.
1pr-learning
Use when mining PR review feedback to extract repeatable rules/learnings, present ranked candidates, and codify approved items into AGENTS.md/CLAUDE.md with dedupe + provenance.
1