chann/skills
git-resolve-conflicts
Use when a merge, rebase, cherry-pick, revert, or stash pop has stopped with conflicts and the working tree must be finished rather than abandoned, including…
Installation
npx skills add https://github.com/chann/skills
Similar popular skills
Related neighbors and high-traction skills in the same topics — useful to compare before installing.
Workflow for fixing package version conflicts. Use this when `pub get` fails due to incompatibl…
124 installsUse when you need to resolve an in-progress git merge/rebase conflict.
9 installsResolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact di…
74 installsWorkflow for fixing package version conflicts. Use this when `pub get` fails due to incompatibl…
93 installs适用于需要解决正在进行的 git merge/rebase 冲突时。
3.5K installsResolve merge conflicts non-interactively, validate build and tests, and finalize conflict reso…
12 installsAlso in this package
Other skills from chann/skills · top by installs.
npx skills add https://github.com/chann/skills
More details
Agent compatibility
Declared targets from SKILL.md / docs. Unmarked agents are not listed — the skill may still install via the CLI.
Repository health
main
History
- First recorded snapshot · 2 installs