{
  "name": "resolving-merge-conflicts",
  "kind": "role-method-skill",
  "upstream": {
    "repository": "https://github.com/mattpocock/skills",
    "path": "skills/engineering/resolving-merge-conflicts",
    "commit": "8b36d4fb2635b3c21998dcd8144439c9e5ba7302",
    "tag": "v1.2.2",
    "license": "MIT",
    "copyright": "Copyright (c) 2026 Matt Pocock",
    "attribution": "mattpocock/skills"
  },
  "packageAdaptation": "merger-merge-only-escalate-new-intent",
  "files": {
    "SKILL.md": {
      "sha256": "a7be3300cd1457cb9b4065935271f37759531ebb366a352896a7a617d8d9c18a",
      "byteLength": 2015,
      "gitBlob": "b88102a6e903c2e60d3b4898552a0931a2fa4c91"
    },
    "agents/openai.yaml": {
      "sha256": "f283f1ac11525de29d2615163fc3239b979f67c8e88560644364ca6e1a3b8100",
      "byteLength": 146,
      "gitBlob": "dc388c3df1d0a72ae2cfe7c78a23747f26e96822"
    }
  }
}