bhagyamudgal/skills
resolving-merge-conflicts
Resolve an in-progress git conflict without a silent drop. Use when the worktree is mid-merge, mid-rebase, mid-cherry-pick or mid-stash-pop: `CONFLICT…
Installation
npx skills add https://github.com/bhagyamudgal/skills
Similar popular skills
Related neighbors and high-traction skills in the same topics — useful to compare before installing.
Use when you need to resolve an in-progress git merge/rebase conflict.
448.5K installs适用于需要解决正在进行的 git merge/rebase 冲突时。
3K installsUse when you need to resolve an in-progress git merge/rebase conflict.
176 installsUse when you need to resolve an in-progress git merge/rebase conflict.
105 installsAlso in this package
Other skills from bhagyamudgal/skills · top by installs.
npx skills add https://github.com/bhagyamudgal/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 seen on skills.sh
- First recorded snapshot · 12 installs