General & Other
Real file from a public repo · synced Sep 3, 2026
pull-changes-resolve-conflicts
Use this skill whenever integrating another branch (usually main) into the current feature branch, or when git status shows unmerged paths after a merge or rebase. Applies to any Git-based team workflow; Flows/React apps are a common case where conflicts cluster in app shells and shared libraries.
Works with
Claude CodeCursorCodex CLIGitHub CopilotGemini CLI
Install in three steps
- 1
Download the ZIP
One file per agent, plus INSTALL.md with the exact paths below.
- 2
Claude Code: copy SKILL.md into your skills folder
.claude/skills/pull-changes-resolve-conflicts/SKILL.md # this project ~/.claude/skills/pull-changes-resolve-conflicts/SKILL.md # every project
- 3
Other agents: use the matching file
skill.mdc goes in Cursor’s .cursor/rules/. AGENTS.md works as GitHub Copilot instructions, a legacy .cursorrules, or a Codex / Gemini CLI instructions file.
More General & Other skills
All General & Other skills
find-skillsvercel-labs/skillsHelps users discover and install agent skills when they ask questions like "how do I do X", "find a skill for X", "is there a skill that can...", or express interest in extending capabilities. This skill should be used when the user is looking for functionality that might exist as an installable skill.General & Other1.5M
grill-memattpocock/skillsA relentless interview to sharpen a plan or design.General & Other972.7kgrill-with-docsmattpocock/skillsA relentless interview to sharpen a plan or design, which also creates docs (ADR's and glossary) as we go.General & Other828.8k
