{"id":"ce2107f7-7647-40de-8faf-cc3e0f383a4e","shortId":"G4ZjTh","kind":"skill","title":"Resolve syntax-aware Git merge conflicts before escalating to manual surgery with Mergiraf","tagline":"Use Mergiraf to let an agent attempt tree-aware conflict resolution during merge, rebase, revert, or cherry-pick before falling back to manual edits.","description":"# Resolve syntax-aware Git merge conflicts before escalating to manual surgery with Mergiraf\n\nUse Mergiraf to let an agent attempt tree-aware conflict resolution during merge, rebase, revert, or cherry-pick before falling back to manual edits.\n\n## Prerequisites\n\nMergiraf, Git\n\n## Installation\n\nUse the upstream install or setup path that matches your environment:\n- Cargo.lock\n- Cargo.toml\n\nRequirements and caveats from upstream:\n- This website requires JavaScript.\n\nBasic usage or getting-started notes:\n- chore(helpers/run.sh): clean-up ( #714 )\n- .envrc.example\n- feat: convert the committed .envrc to an example, with contribution instructions ( #711 )\n\n- Source: https://codeberg.org/mergiraf/mergiraf\n\n## Documentation\n\n- https://mergiraf.org/\n\n## Source\n\n- [Agent Skill Exchange](https://agentskillexchange.com/skills/resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf/)","tags":["resolve","syntax","aware","git","merge","conflicts","before","escalating","manual","surgery","with","mergiraf"],"capabilities":["skill","source-agentskillexchange","skill-resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf","topic-agent-skills","topic-ai-agents","topic-ai-tools","topic-awesome-list","topic-claude-code","topic-codex","topic-cursor","topic-llm","topic-mcp","topic-npx-skills","topic-openclaw","topic-skills-catalog"],"categories":["skills"],"synonyms":[],"warnings":[],"endpointUrl":"https://skills.sh/agentskillexchange/skills/resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf","protocol":"skill","transport":"skills-sh","auth":{"type":"none","details":{"cli":"npx skills add agentskillexchange/skills","source_repo":"https://github.com/agentskillexchange/skills","install_from":"skills.sh"}},"qualityScore":"0.454","qualityRationale":"deterministic score 0.45 from registry signals: · indexed on github topic:agent-skills · 8 github stars · SKILL.md body (919 chars)","verified":false,"liveness":"unknown","lastLivenessCheck":null,"agentReviews":{"count":0,"score_avg":null,"cost_usd_avg":null,"success_rate":null,"latency_p50_ms":null,"narrative_summary":null,"summary_updated_at":null},"enrichmentModel":"deterministic:skill-github:v1","enrichmentVersion":1,"enrichedAt":"2026-05-18T19:12:05.782Z","embedding":null,"createdAt":"2026-05-18T13:18:51.398Z","updatedAt":"2026-05-18T19:12:05.782Z","lastSeenAt":"2026-05-18T19:12:05.782Z","tsv":"'/mergiraf/mergiraf':136 '/skills/resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf/)':145 '711':132 '714':119 'agent':20,60,140 'agentskillexchange.com':144 'agentskillexchange.com/skills/resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf/)':143 'attempt':21,61 'awar':4,24,44,64 'back':37,77 'basic':107 'cargo.lock':96 'cargo.toml':97 'caveat':100 'cherri':33,73 'cherry-pick':32,72 'chore':114 'clean':117 'clean-up':116 'codeberg.org':135 'codeberg.org/mergiraf/mergiraf':134 'commit':124 'conflict':7,25,47,65 'contribut':130 'convert':122 'document':137 'edit':40,80 'environ':95 'envrc':125 'envrc.example':120 'escal':9,49 'exampl':128 'exchang':142 'fall':36,76 'feat':121 'get':111 'getting-start':110 'git':5,45,83 'helpers/run.sh':115 'instal':84,88 'instruct':131 'javascript':106 'let':18,58 'manual':11,39,51,79 'match':93 'merg':6,28,46,68 'mergiraf':14,16,54,56,82 'mergiraf.org':138 'note':113 'path':91 'pick':34,74 'prerequisit':81 'rebas':29,69 'requir':98,105 'resolut':26,66 'resolv':1,41 'revert':30,70 'setup':90 'skill':141 'skill-resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf' 'sourc':133,139 'source-agentskillexchange' 'start':112 'surgeri':12,52 'syntax':3,43 'syntax-awar':2,42 'topic-agent-skills' 'topic-ai-agents' 'topic-ai-tools' 'topic-awesome-list' 'topic-claude-code' 'topic-codex' 'topic-cursor' 'topic-llm' 'topic-mcp' 'topic-npx-skills' 'topic-openclaw' 'topic-skills-catalog' 'tree':23,63 'tree-awar':22,62 'upstream':87,102 'usag':108 'use':15,55,85 'websit':104","prices":[{"id":"e3efa64a-c26f-4382-ab9c-f3978a750078","listingId":"ce2107f7-7647-40de-8faf-cc3e0f383a4e","amountUsd":"0","unit":"free","nativeCurrency":null,"nativeAmount":null,"chain":null,"payTo":null,"paymentMethod":"skill-free","isPrimary":true,"details":{"org":"agentskillexchange","category":"skills","install_from":"skills.sh"},"createdAt":"2026-05-18T13:18:51.398Z"}],"sources":[{"listingId":"ce2107f7-7647-40de-8faf-cc3e0f383a4e","source":"github","sourceId":"agentskillexchange/skills/resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf","sourceUrl":"https://github.com/agentskillexchange/skills/tree/main/skills/resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf","isPrimary":false,"firstSeenAt":"2026-05-18T13:18:51.398Z","lastSeenAt":"2026-05-18T19:12:05.782Z"}],"details":{"listingId":"ce2107f7-7647-40de-8faf-cc3e0f383a4e","quickStartSnippet":null,"exampleRequest":null,"exampleResponse":null,"schema":null,"openapiUrl":null,"agentsTxtUrl":null,"citations":[],"useCases":[],"bestFor":[],"notFor":[],"kindDetails":{"org":"agentskillexchange","slug":"resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf","github":{"repo":"agentskillexchange/skills","stars":8,"topics":["agent-skills","ai-agents","ai-tools","awesome-list","claude-code","codex","cursor","llm","mcp","npx-skills","openclaw","skills-catalog"],"license":"mit","html_url":"https://github.com/agentskillexchange/skills","pushed_at":"2026-05-18T19:02:17Z","description":"The open catalog of AI agent skills — 2,000+ security-scanned skills for Claude Code, Cursor, Codex, and more.","skill_md_sha":"c4b02795094cdf1b4dabae23dd1982e435fe8847","skill_md_path":"skills/resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf/SKILL.md","default_branch":"main","skill_tree_url":"https://github.com/agentskillexchange/skills/tree/main/skills/resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf"},"layout":"multi","source":"github","category":"skills","frontmatter":{"name":"Resolve syntax-aware Git merge conflicts before escalating to manual surgery with Mergiraf","description":"Use Mergiraf to let an agent attempt tree-aware conflict resolution during merge, rebase, revert, or cherry-pick before falling back to manual edits."},"skills_sh_url":"https://skills.sh/agentskillexchange/skills/resolve-syntax-aware-git-merge-conflicts-before-escalating-to-manual-surgery-with-mergiraf"},"updatedAt":"2026-05-18T19:12:05.782Z"}}