conflict-resolution

Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity

conflict

resolution

Also installable via skills CLI

npx skills add troykelly/claude-skills/skills/conflict-resolution

Source

Path:skills/conflict-resolution(main)

Use when you have lint errors, formatting issues, or before committing code to ensure it passes CI.

This skill should be used when the user asks to "update documentation for my changes", "check docs for this PR", "what docs need u...

Write docstrings for PyTorch functions and methods following PyTorch conventions. Use when writing or updating docstrings in PyTor...