Pull Changes Resolve Conflicts

Stops you from blowing away your work when you pull main into a feature branch. Instead of silently picking one side, it fetches, spots conflicts, then shows you every unmerged file grouped by impact: structural and API changes first, styling last. You get a recommendation table with reasons before any conflict markers get touched. The hard rule is no edits until you confirm the plan. Especially useful on multi-contributor projects where main moves fast and you need to see what changed in shared shells, route modules, or hooks before deciding whether to keep your version, theirs, or combine both. Treats merge conflicts like code review, not obstacles to automate away.

skills.sh installs: 1.9K
GitHub stars: 6
last updated: Aug 21, 2026

View on GitHub

Install

$ npx -y skills add cognitedata/builder-skills --skill pull-changes-resolve-conflicts --agent claude-code

Installs into .claude/skills of the current project.

Files

Pull changes & resolve merge 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.

Goals

Preserve intentional work on the current branch; do not assume “main wins” or “ours wins” without analysis.
Make trade-offs visible to the user before any conflict resolution edits.
Order discussion by impact: structural / feature / API / data-model changes before styling, copy, or spacing.