Resolve Merge Conflicts
by warpdotdev2a03b403b4f8No licenseListed Oct 8, 2026Updated Oct 8, 2026
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.
Only the file list is public. File contents are available once the skill is installed in a workspace.
| Path | Size | Type |
|---|---|---|
| scripts/extract_conflict_context.py | 15.5 KB | text/plain |
| SKILL.md | 2.9 KB | text/markdown |
Source and attribution
Source:warpdotdev/common-skillsin.agents/skills/resolve-merge-conflictsat commit2a03b40
License: No license
Content belongs to its original authors. SourceWeft indexes it from a public repository.
More from warpdotdev/common-skills
Write Tech Spec
warpdotdev
Writes a TECH.md technical spec for a significant feature, grounded in codebase research and implementation constraints.
Write Product Spec
warpdotdev
Writes a PRODUCT.md product spec describing user-facing feature behavior as numbered, testable invariants.
Write Pr Description
warpdotdev
Writes the body of a pull request - the summary, the repository template sections, and reviewer guidance such as a recommended reading order and focus areas. Use whenever drafting or revising a PR description, filling in a repository's PR template, refreshing a description that no longer matches the branch, or preparing a branch for review. Use it even when the user only says "open a PR", "put this up for review", or "write this up" without naming the description.
Write Feature Docs
warpdotdev
Drafts a first-pass MDX documentation page for a new Warp feature from its spec, then opens a draft PR in the docs repo.
Validate Changes Match Specs
warpdotdev
Validates that a branch or pull request implementation matches its checked-in product, technical, and security specs.
Spec Driven Implementation
warpdotdev
Guides a spec-first workflow for substantial features, writing PRODUCT.md and TECH.md before implementation and keeping them current.
More in Software Development
Playground
anthropics
Builds self-contained interactive HTML playgrounds with controls, live preview, and copyable prompt output.
M5 Onboard
anthropics
Provisions M5Stack ESP32 boards by detecting them on USB, flashing UIFlow 2.0 firmware, and installing a MicroPython app bundle.
Cardputer Buddy
anthropics
Guides iterating on a Cardputer-Adv MicroPython app bundle: adding apps, pushing files over USB-serial, tailing logs, and running REPL commands.
Dpop Adoption
Guides implementation of OAuth 2.0 DPoP (RFC 9449) sender-constrained refresh tokens for Google's OAuth platform.
Gemini Live Api
Generates a Gemini Live API WebSocket client class, tests, docs, and a demo UI for bidirectional streaming.
Gemini Api
Guides use of the Gemini API on Google's Agent Platform with the Gen AI SDK across languages and capabilities.