npx skills add warpdotdev/common-skills --skill resolve-merge-conflicts
arjitj2/arjit-skills · Archived
resolve-merge-conflicts
Resolve PR merge conflicts end-to-end by identifying the base branch, merging it locally, fixing conflicted files carefully, validating the result, and pushing…
Installation
$
npx skills add https://github.com/arjitj2/arjit-skills
Stronger alternatives
This repository is archived — consider an actively maintained alternative.
swiftui-design-principles
Same source · more installs
arjitj2/arjit-skills
Design principles for building polished, native-feeling SwiftUI apps and widgets. Use this skil…
5 installs
ios-simulator-testing
Same source · more installs
arjitj2/arjit-skills
End-to-end iOS simulator testing using blitz-iphone MCP and XcodeBuildMCP. Use this skill when …
4 installs
address-copilot-review
Same source · more installs
arjitj2/arjit-skills
Handle GitHub Copilot PR review comments end-to-end. Use when the user asks to read Copilot's r…
4 installs
frontend-slides
Same source · more installs
arjitj2/arjit-skills
Create stunning, animation-rich HTML presentations from scratch or by converting PowerPoint fil…
4 installsSimilar 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
resolve-merge-conflicts
Similar name
warpdotdev/common-skills
Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact di…
24.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 installsAlso in this package
Other skills from arjitj2/arjit-skills.
npx skills add https://github.com/arjitj2/arjit-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
Also listed on
Alternate registries and mirrors of this skill.
Repository health
Default branch
main
Open issues
0
Status
Archived
History
- First seen on skills.sh
- First recorded snapshot · 3 installs