COcognitedatabuilder-skills1,900 installs on skills.sh

Pull Changes Resolve Conflicts

Standard workflow for pulling updates from main or other branches on multi-contributor projects...

Use in my agent
Use Edge to load the skill pull-changes-resolve-conflicts from cognitedata/builder-skills for my task. If Edge is not set up, read getedge.cc/SKILL.md and ask me first.
Works in any agentClaude CodeCodexCursorClaude appChatGPT+ any other agent
cognitedata/builder-skills
Security state: reviewed

2 static scans, 0 counted findings.

Edge checks it again each time your agent loads it.

SKILL.md2 files · 6.2 KB

From the cognitedata public repository. Edge did not write or edit this skill.

What it does

  • 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.

How it works

  1. 1
    Copy

    Try for free gives you one prompt.

  2. 2
    Paste

    Paste it into Claude Code, Codex or Cursor.

  3. 3
    Ask

    Ask for the outcome. Your agent loads Pull Changes Resolve Conflicts.

Related skills

TI
Resolving Merge Conflicts
timschoch

Use when you need to resolve an in-progress git merge/rebase conflict.

JS
Resolve PR Conflicts
jssblck

Use when a PR has merge conflicts with its base branch, including conflicts found during babysitting or merging.

MD
Fix Merge Conflicts
michael-denyer

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

NI
PR Feedback Quality Gate
nexu-io

Safely track pull request feedback, resolve review comments or merge conflicts, validate fixes, and use a read-only cross-review before committing or pushing follow-up changes.

GD
Git Workflow
galaxy-dawn

This skill should be used when the user asks to "create git commit", "manage branches", "follow git workflow", "use Conventional Commits", "handle merge conflicts", or asks about git branching strategies, version control

PR
Prisma Next Migration Review
prisma

Review what Prisma Next migrations will run on merge or deploy, render the migration graph, resolve concurrent / diamond-convergence conflicts, and configure environment refs for CI. Use for "what migrations are going to

Evidence

No evidence record yet

No measured run with and without this skill yet, so this page makes no performance claim. 2 static scans, 0 counted findings. Security state at 2026-11-18: reviewed. Static scans check the code, not how well the skill works.

State definitions
SKILL.md5,665 bytes · Open on GitHub

Skill details

Security scansReviewed

2 static scans, 0 counted findings. Security state at 2026-11-18: reviewed. Edge checks it again each time your agent loads it.

Edge static checks (Edge-run): edge-static/1.0.2. Scope: Static patterns for remote execution, credentials with network sends, obfuscation, prompt overrides, hidden Unicode, binaries and persistence. Raw findings: not supplied.

Edge committed-secret checks (Edge-run): edge-secrets/1.0.0. Scope: Credentials committed in the skill's files (values never shown). Raw findings: not supplied.

Socket (skills.sh mirror): Version unavailable. Scope: Not supplied by the mirrored record. Raw findings: not supplied.

Snyk (skills.sh mirror): Version unavailable. Scope: Not supplied by the mirrored record. Raw findings: not supplied.

Edge static checks
Pass · 0 counted findings · 2026-11-18
Edge committed-secret checks
Pass · 0 counted findings · 2026-11-18
Creator, source & licencecognitedata

From the cognitedata public repository. Edge did not write or edit this skill.

Revision
971522691216b1fff6272334dae867c305fcb074
Package hash
sha256:eab9b3a8d9090192d50ba03450baa9f9d4e5d172735985c1efc48d81ab581f85
Licence
Apache-2.0
Description
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.
Quoted from the skill’s own description
Read skill files2 files

2 files, 6.2 KB at revision 971522691216.

Questions about Pull Changes Resolve Conflicts

What does Pull Changes Resolve Conflicts do?

Standard workflow for pulling updates from main or other branches on multi-contributor projects... Published by cognitedata (cognitedata/builder-skills).

Is Pull Changes Resolve Conflicts safe to use?

Edge security state: Reviewed (2 Edge-run static scans, scanned Nov 18, 2026). The Evidence tab shows the scan.

How do I use Pull Changes Resolve Conflicts in Claude Code, Codex or Cursor?

Click Try for free, pick your agent and follow its one step. Edge is free, with no Edge account.