{"slug":"stevesolun-resolving-merge-conflicts","source_name":"stevesolun/resolving-merge-conflicts","name":"Stevesolun/Resolving Merge Conflicts","description":"Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides. Use when conflict markers or an interrupted merge/rebase need investigation and resolution.","version":1,"lift":{"pass_rate_delta_pts":null,"pass_rate_pct":31.8,"total_cases":22,"passed_cases":7,"tokens_delta_pct":-5.8,"turns_delta_pct":0,"verdict":"mixed","benchmark_model":"gemini-3.6-flash","grading_method":"judged","completed_at":"2026-09-25T12:58:50.074597+00:00"},"skill_score":null,"benchmark_models":[{"model":"gemini-3.6-flash","headline":false,"delta_pts":null,"with_pass_pct":null,"without_pass_pct":null,"tokens_delta_pct":-5.8,"turns_delta_pct":0,"total_cases":22,"cases_aggregated":7,"verdict":"mixed","never_hurt":false,"completed_at":"2026-09-25T12:58:50.074597+00:00","run_id":"48fe5fb8-197e-40ae-bd7c-7d131a671b84","latest_attempt":{"id":"48fe5fb8-197e-40ae-bd7c-7d131a671b84","runner_model":"gemini-3.6-flash","overall_verdict":"mixed","completed_at":"2026-09-25T12:58:50.074597+00:00","gate":"underpowered"},"version_number":1,"is_latest_version":true,"gate":"underpowered"}],"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":"756ff5a9ec284c7c6f7afa765ed2143ac134066015fd5b1a8871ba69d18a0c2e","install_name":"stevesolun-resolving-merge-conflicts","version_id":"51e0ba28-7af7-4f09-9784-6bd23355dfa3","body_sha256":"756ff5a9ec284c7c6f7afa765ed2143ac134066015fd5b1a8871ba69d18a0c2e","render_hash":"620526d3ea4e7281fa3b1477e1a1972ef1e668677f14ca9e7704dc6388cf2afb","raw_url":"https://app.decimal.ai/s/stevesolun-resolving-merge-conflicts/SKILL.md","scorecard_url":"https://app.decimal.ai/skills/stevesolun-resolving-merge-conflicts"}