tarsk
Docs
Skills & MCP
Collections
Matt Pocock
Resolving Merge Conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Install Skill
Repository
Author
Matt Pocock
Version
1.2.3
Last updated
Sep 27, 2026
Included skills
Resolving Merge Conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Published metadata
name
resolving-merge-conflicts
version
1.2.3
description
Use when you need to resolve an in-progress git merge/rebase conflict.