Files
tgrosinger 60fc72892e Skills: Keep the resolving-merge-conflicts skill
This was removed from mattpocock-skills.
2026-09-29 09:21:26 -07:00

4 lines
113 B
YAML

interface:
display_name: "Resolving Merge Conflicts"
short_description: "Resolve merge and rebase conflicts"