SkillsAdd

warpdotdev/common-skills

resolve-merge-conflicts

Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context.

All-time #899 Trending #987 Hot #65 First seen May 9, 2026
8-week activity · all time api

Installation

$ npx skills add warpdotdev/common-skills --skill resolve-merge-conflicts
View on skills.sh ↗ GitHub repository ↗

Summary

  • Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context.
  • Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.

Similar popular skills

Related neighbors and high-traction skills in the same topics — useful to compare before installing.

dart-resolve-package-conflicts Similar name
flutter/agent-plugins

Workflow for fixing package version conflicts. Use this when `pub get` fails due to incompatibl…

7.5K installs
resolving-merge-conflicts Similar name
mattpocock/skills

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

448.5K installs
dart-resolve-package-conflicts Similar name
dart-lang/skills

Workflow for fixing package version conflicts. Use this when `pub get` fails due to incompatibl…

14.4K installs
resolving-merge-conflicts Similar name
vinvcn/mattpocock-skills-zh-cn

适用于需要解决正在进行的 git merge/rebase 冲突时。

3K installs
fix-merge-conflicts Similar name
cursor/plugins

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

2.1K installs
pull-changes-resolve-conflicts Similar name
cognitedata/builder-skills

>- Standard workflow for pulling updates from main or other branches on multi-contributor proje…

1.9K installs

Security audits

Partner security reviews for this skill.

agent-trust-hub SAFE

Analyzed May 9, 2026

This skill provides a utility to safely extract and summarize Git merge conflict context from a local repository. It follows security best practices for command execution and does not perform any unauthorized network or filesystem operations.

snyk LOW

Analyzed May 9, 2026

No issues detected.

socket Score 0.9000 · 0 alerts

Analyzed May 9, 2026

  • license 1
  • maintenance 1
  • quality 0.9
  • supply chain 0.99
  • vulnerability 1

0 alerts

Also in this package

Other skills from warpdotdev/common-skills · top by installs.

npx skills add warpdotdev/common-skills
review-pr 24.7K spec-driven-implementation 24.6K write-product-spec 24.6K write-tech-spec 24.5K fix-errors 24.5K implement-specs 24.4K diagnose-ci-failures 24.4K update-skill 24.4K create-pr 24.4K brandalf 24.1K

Browse all from warpdotdev/common-skills

More details

Agent compatibility

Declared targets from SKILL.md / docs. Unmarked agents are not listed — the skill may still install via the CLI.

Claude Code Not declared
Cursor Not declared
Codex Not declared
GitHub Copilot Not declared
Windsurf Not declared
Gemini CLI Not declared
Cline Not declared
OpenCode Not declared

Repository health

Stars 559
License LICENSE
Default branch main
Open issues 7
Status Active

Package contents

Files included with this skill beyond the listing page.

  • skill md SKILL.md 2,929 B
  • docs SUMMARY.md 326 B

History

  1. First seen on skills.sh
  2. First recorded snapshot · 24,600 installs

SKILL.md

Resolve Merge Conflicts

Overview

Resolve conflicts without opening full files unless the compact view is insufficient. Start with a summary, then inspect one conflicted file at a time.

Workflow

  1. Start with a summary.
python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py

Use the summary to identify which files are unresolved, which index stages exist, and how many text hunks each file contains.

  1. Drill into one file.
python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py --file path/to/file

Prefer this over reading the whole file. The script prints only nearby context, the ours / base / theirs sections for each hunk, and a compact unified diff between ours and theirs.

  1. Resolve the file.
  • Take one side wholesale with git checkout --ours -- path/to/file or git checkout --theirs -- path/to/file when appropriate.
  • Otherwise edit the file directly and remove the conflict markers.
  • Read more of the file only if the compact output is not enough to decide the correct merge.
  1. Re-check unresolved files.
python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py
git diff --name-only --diff-filter=U
  1. Validate the resolution.
  • Ensure no unmerged paths remain.
  • Ensure no <<<<<<<, =======, or >>>>>>> markers remain in the resolved files.
  • Run targeted tests, builds, or linters for the touched area.
  • Stage the resolved files.

Commands

Summary only

python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py

Detailed view for one file

python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py --file path/to/file

Detailed view for all conflicted files

python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py --all

JSON output

python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py --file path/to/file --json

Tune output size

python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py \
  --file path/to/file \
  --context 3 \
  --max-lines 60

Notes

  • Use the script before opening conflicted files directly.
  • Resolve one file at a time to keep context small.
  • Expect marker-based text conflicts and index-only conflicts such as add/add or modify/delete. The script summarizes both, and it falls back to index-stage previews when the worktree file has no conflict markers.