{"slug":"mattpocock-resolving-merge-conflicts","source_name":"mattpocock/resolving-merge-conflicts","name":"Mattpocock/Resolving Merge Conflicts","description":"Use when you need to resolve an in-progress git merge/rebase conflict.","version":1,"lift":{"pass_rate_delta_pts":-13.04,"pass_rate_pct":52.2,"total_cases":23,"passed_cases":12,"tokens_delta_pct":8,"turns_delta_pct":0,"verdict":"mixed","benchmark_model":"gemini-3.6-flash","grading_method":"judged","completed_at":"2026-09-26T22:44:45.757812+00:00"},"skill_score":null,"benchmark_models":[{"model":"gemini-3.6-flash","headline":true,"delta_pts":-13.04,"with_pass_pct":52.2,"without_pass_pct":65.2,"tokens_delta_pct":8,"turns_delta_pct":0,"total_cases":23,"cases_aggregated":16,"verdict":"mixed","never_hurt":false,"completed_at":"2026-09-26T22:44:45.757812+00:00","run_id":"08ec2bd2-b250-45b0-b521-b760c88ff42b","latest_attempt":{"id":"08ec2bd2-b250-45b0-b521-b760c88ff42b","runner_model":"gemini-3.6-flash","overall_verdict":"mixed","completed_at":"2026-09-26T22:44:45.757812+00:00","gate":null},"version_number":1,"is_latest_version":true,"gate":null}],"trust":{"skill_safety":"passed","safety_status":"clean","intent_verdict":"safe","content_status":"clean","indexable":true},"license":"MIT","install_count":0,"total_uses":0,"total_users":0,"manifest_hash":"53a17acc2c2c4337811b4028117650c8a46f003876cf10689b08c44944ac6f86","install_name":"mattpocock-resolving-merge-conflicts","version_id":"f27944a0-40f8-4843-a170-8c998fd3f28a","body_sha256":"53a17acc2c2c4337811b4028117650c8a46f003876cf10689b08c44944ac6f86","render_hash":"e9e58242127754cfef1d59218c2bc894d4c21b8e91479559938d544734df0a8e","raw_url":"https://app.decimal.ai/s/mattpocock-resolving-merge-conflicts/SKILL.md","scorecard_url":"https://app.decimal.ai/skills/mattpocock-resolving-merge-conflicts"}