{"object":"skill_manifest","data":{"schema_version":"0.1","name":"resolving-merge-conflicts","slug":"resolving-merge-conflicts","version":"0.1.0","creator_id":"mattpocock/skills","category":"developer_exp","description":"A source-driven merge and rebase workflow that traces intent, resolves conflicts, runs project checks, and completes the Git operation.","skill_type":"tooling_skill","risk_level":"high","pricing":{"model":"free","price_cents":0,"currency":"USD","marketplace_fee_bps":2000},"runtime_compatibility":["codex_skill","markdown_export"],"permissions":{"read_files":true,"write_files":true,"web_access":false,"api_access":false,"mcp_access":false,"code_execution":true,"external_actions":false,"personal_data_access":false},"integrations":{"api":[],"mcp":[]},"regulated_domain":null,"jurisdictions":[],"advisory_only":false,"requires_human_review":true,"restricted_visibility":false,"professional_review_notice":null,"creator_attestation":null,"taste_profile":null,"tags":["git","merge","rebase","conflicts"],"badges":[],"outcome":"Investigate both sides of a conflict, resolve every hunk, validate the result, and finish the merge or rebase."}}