Explore
Sign In
skills/resolving-merge-conflicts
1
0
Fork 0
You've already forked resolving-merge-conflicts
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1 Commit 1 Branch 0 Tags
main
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
hub 3bf7bde10d Add resolving-merge-conflicts skill (source: mattpocock/skills)
2026-09-12 01:01:17 +08:00
agents
Add resolving-merge-conflicts skill (source: mattpocock/skills)
2026-09-12 01:01:17 +08:00
SKILL.md
Add resolving-merge-conflicts skill (source: mattpocock/skills)
2026-09-12 01:01:17 +08:00
S
Description
Use when you need to resolve an in-progress git merge/rebase conflict.
https://github.com/mattpocock/skills
22 KiB
Languages
Markdown 100%
Version: v1.25.5 Page: 84ms Template: 3ms
Auto
English
Bahasa Indonesia Deutsch English Español Français Gaeilge Italiano Latviešu Magyar nyelv Nederlands Polski Português de Portugal Português do Brasil Suomi Svenska Türkçe Čeština Ελληνικά Български Русский Українська فارسی മലയാളം 日本語 简体中文 繁體中文(台灣) 繁體中文(香港) 한국어