Pull Changes Resolve Conflicts

This one's for anyone who's tired of staring at angle brackets and equal signs when a merge goes sideways. It walks you through Git conflicts with a structured triage: structural and API changes first, then behavior and UI, then styling and copy tweaks last. The key thing is it won't silently pick a side or auto-resolve without showing you the tradeoffs. You get a plan before any conflict markers disappear. Works for any Git workflow, but the maintainers clearly built it with React and Dune apps in mind, where conflicts love to pile up in shared shells and libraries. 174 installs so far, passes all three security audits.

Install to Claude Code

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