{"slug":"fradser-resolving-merge-conflicts","source_name":"fradser/resolving-merge-conflicts","name":"Fradser/Resolving Merge Conflicts","description":"Use when you need to resolve an in-progress git merge/rebase conflict.","version":1,"lift":{"pass_rate_delta_pts":-4.35,"pass_rate_pct":43.5,"total_cases":23,"passed_cases":10,"tokens_delta_pct":2,"turns_delta_pct":0,"verdict":"mixed","benchmark_model":"gemini-3.6-flash","grading_method":"judged","completed_at":"2026-08-29T05:57:31.908448+00:00"},"skill_score":null,"benchmark_models":[{"model":"gemini-3.6-flash","headline":true,"delta_pts":-4.35,"with_pass_pct":43.5,"without_pass_pct":47.8,"tokens_delta_pct":2,"turns_delta_pct":0,"total_cases":23,"cases_aggregated":13,"verdict":"mixed","never_hurt":false,"completed_at":"2026-08-29T05:57:31.908448+00:00","run_id":"506be778-7848-4aee-8a50-647c4bd2284f","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,"manifest_hash":"56c102e20a9c1a1fb9419d8367999672379ec7374d18bcded7c68ec1ae06cf52","raw_url":"https://app.decimal.ai/s/fradser-resolving-merge-conflicts/SKILL.md","scorecard_url":"https://app.decimal.ai/skills/fradser-resolving-merge-conflicts"}