Resolve Pr Conflicts
jssblck/agents/skills/resolve-pr-conflictsby jssblck8715dcc8a572No licenseListed Oct 9, 2026Updated Oct 9, 2026Repository updated today
Use when a PR has merge conflicts with its base branch, including conflicts found during babysitting or merging.
Only the file list is public. File contents are available once the skill is installed in a workspace.
| Path | Size | Type |
|---|---|---|
| references/conflicts.md | 1.3 KB | text/markdown |
| SKILL.md | 2.1 KB | text/markdown |
Source and attribution
Source:jssblck/agentsinskills/resolve-pr-conflictsat commit8715dcc
License: No license
Content belongs to its original authors. SourceWeft indexes it from a public repository.
More from jssblck/agents
Tag Release
jssblck
Tags a repository release by inspecting conventions, computing the next version, pushing the tag, and watching the pipeline.
Parallel Agents
jssblck
Use when agents work concurrently in a codebase, shared files have recurring merge conflicts, or AGENTS.md or CLAUDE.md needs maintenance.
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.