pull-changes-resolve-conflicts
Standard workflow for pulling updates from main or other branches on multi-contributor projects (including Flows apps) without silently discarding work. Guides fetching/merging, requires listing merge conflicts explicitly, analyzing ours vs theirs using conversation history and repo context, presenting prioritized recommendations, and obtaining user answers before editing conflict markers or completing the merge. Triggers: pull main, merge main, merge origin, rebase, merge conflict, unmerged paths, both modified, integrate branch, sync with main, git merge abort, resolve conflicts, UU status, theirs vs ours, feat branch update.
78
90%
Does it follow best practices?
Impact
65%
1.00xAverage score across 1 eval scenario
Passed
No findings from the security scan
Evaluation results
65%
Integrating Security Updates into the Login Feature Branch
Git conflict resolution workflow with classification and surgical edits
git show :2: used
0%
0%
git show :3: used
0%
0%
src/api.js classified overlapping
70%
100%
package.json classified orthogonal
80%
50%
No conflict markers remain
100%
100%
git-status.txt shows clean merge
100%
100%
Merge commit present
100%
100%
Commit message identifies merge direction
100%
100%
Conflict resolutions section in commit
0%
0%
Both sides preserved in package.json
100%
100%
No wholesale --ours/--theirs
100%
100%
- Repository
- cognitedata/builder-skills
- Commit
c87160a
- Evaluated
- Agent
- Claude Code
- Model
- Claude Sonnet 4.6
Table of Contents
Is this your skill?
If you maintain this skill, you can claim it as your own. Once claimed, you can manage eval scenarios, bundle related skills, attach documentation or rules, and ensure cross-agent compatibility.