Pull Changes Resolve Conflicts
cognitedata/builder-skillsWhen multiple people work on the same code, merging changes can cause merge conflicts. This skill helps you pull changes from a main branch and handle those conflicts safely. It never makes decisions for you. It lists every conflict, analyzes what changed, and gives recommendations based on impact. You choose what to keep.
Teams building apps with Git benefit the most. The workflow prevents losing work by accident. It asks for your approval before editing any conflict markers. This keeps your codebase clean and your team in control.
Add Pull Changes Resolve Conflicts skill to your workflow
Global
mkdir -p ~/.claude/skills/pull-changes-resolve-conflictsProject
mkdir -p .claude/skills/pull-changes-resolve-conflictsSource Repository
More Git & Pull Requests Claude Code Skills
Caveman Commitjuliusbrussee/caveman
Generate ultra-compressed commit messages with Conventional Commits format
Verification Before Completionobra/superpowers
Always run fresh verification before claiming work is complete or passing
Using Git Worktreesobra/superpowers
Isolate your feature work with git worktrees and keep your main branch safe
Finishing A Development Branchobra/superpowers
Finish your development branch with merge, pull request, or cleanup options
Git Guardrails Claude Codemattpocock/skills
Stop dangerous git commands from running automatically with safety hooks
Setup Pre Commitmattpocock/skills
Automate code formatting type checking and tests before every commit
Git Commitgithub/awesome-copilot
Automatically write standardized git commits by analyzing your code changes
Git Advanced Workflowswshobson/agents
Master advanced Git workflows for clean history and confident recovery