{"slug":"saffron-health-fix-merge-conflicts","source_name":"saffron-health/fix-merge-conflicts","name":"Saffron Health/Fix Merge Conflicts","description":"Resolve Git merge, rebase, or cherry-pick conflicts by preserving intent from both sides. Use when unmerged paths or conflict markers are present, especially when you must inspect the PR title and description tied to conflicting commits before choosing a resolution.","version":1,"lift":{"pass_rate_delta_pts":-16.67,"pass_rate_pct":41.7,"total_cases":24,"passed_cases":10,"tokens_delta_pct":18.2,"turns_delta_pct":0,"verdict":"mixed","benchmark_model":"gemini-3.6-flash","grading_method":"judged","completed_at":"2026-08-16T18:45:56.206140+00:00"},"skill_score":null,"benchmark_models":[{"model":"gemini-3.6-flash","headline":true,"delta_pts":-16.67,"with_pass_pct":33.3,"without_pass_pct":50,"tokens_delta_pct":18.2,"turns_delta_pct":0,"total_cases":24,"cases_aggregated":19,"verdict":"mixed","never_hurt":false,"completed_at":"2026-08-16T18:45:56.206140+00:00","run_id":"18649824-488f-4f30-b5eb-3bb09f9af549","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":"b23f9dbe8675089faeecf22f6ea0a216839da58de943744a8bcd602c72fb051d","raw_url":"https://app.decimal.ai/s/saffron-health-fix-merge-conflicts/SKILL.md","scorecard_url":"https://app.decimal.ai/skills/saffron-health-fix-merge-conflicts"}