resolving-merge-conflicts

{
  "ocm": "1",
  "id": "mattpocock-skills-resolving-merge-conflicts",
  "kind": "skill",
  "name": "resolving-merge-conflicts",
  "description": "Use when you need to resolve an in-progress git merge/rebase conflict.",
  "publisher": "mattpocock",
  "version": "1.0.0",
  "capabilities": {
    "domains": [
      "coding"
    ],
    "tags": [
      "skill-md",
      "skills-sh"
    ],
    "languages": [
      "en"
    ]
  },
  "quality_prior": 0.6,
  "examples": [
    "Use when you need to resolve an in-progress git merge/rebase conflict."
  ],
  "primary": false,
  "metadata": {
    "source": {
      "provider": "skills.sh",
      "repository": "https://github.com/mattpocock/skills",
      "path": "skills/engineering/resolving-merge-conflicts/SKILL.md",
      "ref": "HEAD",
      "url": "https://www.skills.sh/mattpocock/skills/resolving-merge-conflicts",
      "key": "mattpocock/skills/skills/engineering/resolving-merge-conflicts/SKILL.md"
    }
  },
  "instructions": "1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.\n\n2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.\n\n3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.\n\n4. Discover the project's **automated checks** and run them, typically typecheck",
  "cost": {
    "context_tokens": 197
  }
}