resolve-merge-conflicts
resolve merge conflicts
Claude Code
Maintain resolve-merge-conflicts?
Let people know it's listed here — add the badge (live metrics, light/dark aware) or a plain link to your README or docs.
[](https://getagentictools.com/skills/warpdotdev-common-skills-resolve-merge-conflicts?ref=badge)