Resolving Merge Conflicts
by vinvcn3f92a83668efNo license4.6K starsListed Oct 8, 2026Updated Oct 8, 2026Repository updated today
适用于需要解决正在进行的 git merge/rebase 冲突时。
Only the file list is public. File contents are available once the skill is installed in a workspace.
| Path | Size | Type |
|---|---|---|
| agents/openai.yaml | 112 B | application/yaml |
| SKILL.md | 871 B | text/markdown |
Source and attribution
Source:vinvcn/mattpocock-skills-zh-cninskills/engineering/resolving-merge-conflictsat commit3f92a83
License: No license
Content belongs to its original authors. SourceWeft indexes it from a public repository.
More from vinvcn/mattpocock-skills-zh-cn
Wayfinder
vinvcn
Plans large, foggy efforts as a shared map of decision tickets on an issue tracker, resolving them until the route is clear.
Triage
vinvcn
Triages project issues and external pull requests through a role-based state machine, producing agent-ready briefs.
To Tickets
vinvcn
Splits a plan, spec, or conversation into tracer-bullet tickets with blocking edges and publishes them to a tracker.
To Spec
vinvcn
Turns the current conversation into a spec document and publishes it to the project issue tracker.
Setup Matt Pocock Skills
vinvcn
Configures per-repository engineering skills setup: issue tracker, triage labels, and domain docs layout.
Research
vinvcn
Runs background research against primary sources and saves sourced findings as a Markdown file in the repository.
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.
Web Design Guidelines
vercel-labs
Reviews UI code against Web Interface Guidelines fetched from a remote source and reports findings as file:line entries.
Vercel React Native Skills
vercel-labs
React Native and Expo best-practice rules covering list performance, animation, navigation, UI patterns, state, and monorepo setup.
Vercel React Best Practices
vercel-labs
Vercel's React and Next.js performance guidelines, organized as 70 rules for writing, reviewing, and refactoring code.