mattpocock/skills
resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
All-time installs501.8KObserved Sep 18, 2026
Trending · 24h6,137Observed Sep 18, 2026
Hot · last hour213Observed Sep 14, 2026
What you’re adding
This skill may reference tools or services you need to set up separately. The package check shows the exact files; it does not install dependencies or run scripts.
2 files in the provider snapshot
agents/openai.yaml113 BSKILL.md918 B
Snapshot inspected Sep 9, 2026. Adding uses a fresh GitHub revision and checks it separately.
Your vault, your checks
- 01Inspect the source
Review the exact revision, files and available capacity.
- 02Save a private Draft
Run your vault’s security scan and complete any required review.
- 03Use the approved version
Make it available through your existing agent connection.
Observed activity
All-time installs reported by skills.sh. Daily observations start when this catalog is first synchronized.
| Date | Installs | Rank |
|---|---|---|
| Sep 11, 2026 | 463,926 | #75 |
| Sep 13, 2026 | 473,540 | #74 |
| Sep 14, 2026 | 477,783 | #74 |
| Sep 15, 2026 | 483,777 | #79 |
| Sep 16, 2026 | 489,737 | #79 |
| Sep 17, 2026 | 495,792 | #79 |
| Sep 18, 2026 | 501,842 | #80 |