Resolving Merge Conflicts
by mattpocockc55ee46073edNo licenseListed Oct 8, 2026Updated Oct 8, 2026
Use when you need to resolve an in-progress git merge/rebase conflict.
Only the file list is public. File contents are available once the skill is installed in a workspace.
| Path | Size | Type |
|---|---|---|
| agents/openai.yaml | 113 B | application/yaml |
| SKILL.md | 918 B | text/markdown |
Source and attribution
Source:mattpocock/skillsinskills/engineering/resolving-merge-conflictsat commitc55ee46
License: No license
Content belongs to its original authors. SourceWeft indexes it from a public repository.
More from mattpocock/skills
Chief Of Staff
mattpocock
Coordinates subagents and schedules to pursue a long-running goal in one session.
Writing For Agents
mattpocock
A reference on writing documents that AI agents consume, such as skills, AGENTS.md and CLAUDE.md files.
Wait What
mattpocock
Re-pitches a confusing message using Simplified Technical English and the project's ubiquitous language.
To Questionnaire
mattpocock
Turns a decision the user cannot answer alone into a Markdown questionnaire for someone else to fill in.
Teach
mattpocock
Teaches a user a topic over multiple sessions, producing HTML lessons, reference sheets and learning records in a workspace.
Handoff
mattpocock
Compacts the current conversation into a handoff document so a fresh agent can continue the work.
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.