Skip to content

Explore

Outputs Tasks Skills

Compare Community Leaderboards

Loading runs…

Account

Loading skill…

Skills/

Skill

Only outputs with a direct recorded relationship appear below.

Generated outputs that directly record this skill or its named repository.

Source

About this skill

Publisher
On source
Tasks here
Outputs here
Access

Community

Provenance

Identifier
Recorded version
Captured

Skills/mattpocock/skills

S

/resolving-merge-conflicts

mattpocock/skills

Skill

Use when you need to resolve an in-progress git merge/rebase conflict.

Only outputs with a direct recorded relationship appear below.

Author, repository, listing and third-party discovery references stay distinct.

Skill bymattpocock

Repositorymattpocock/skills

Listed on skills.sh559,028 installs

Mentions 2

AgentOSYouTube2026-07-12

The rule behind Matt Pocock’s 29 skills Collection

Matt PocockX2026-06-10

Steps to become a senior programmer: 1. Install my /teach skill npx skills add mattpocock/skills --skill teach 2. Cre…Collection

Source details

Skill identifier: skl_6GB12B09EA8TX85M2RPYEB1BPP
Captured: 2026-10-03

S

Sourceskills.sh ↗

About this skill

Publisher: mattpocock/skills
On source: 559K installs
Tasks here: 0 linked
Outputs here: 0 linked
Access: Free

Community

Provenance

Identifier: mattpocock/skills/resolving-merge-conflicts
Recorded version: Not Recorded
Captured: 2026-10-03

View all sources