Automatically resolve merge conflicts in the current PR. Fetches the base branch, attempts a merge, identifies conflicting files, analyzes both sides, resolves conflicts, verifies locally, and pushes. Use when PR has merge conflicts detected by poll-pr-status.sh.
Quickly install fix-conflict AI skill to your development environment via command line
Source: s-hiraoku/synapse-a2a.
This skill automatically resolves merge conflicts for the current PR by fetching the base branch, performing a test merge, analyzing conflicting files, and applying resolutions.
If no PR exists, report "No PR found for the current branch. Nothing to resolve." and stop.
If the merge fails with conflicts, proceed to the next step.
Automatically resolve merge conflicts in the current PR. Fetches the base branch, attempts a merge, identifies conflicting files, analyzes both sides, resolves conflicts, verifies locally, and pushes. Use when PR has merge conflicts detected by poll-pr-status.sh. Source: s-hiraoku/synapse-a2a.
Stable fields and commands for AI/search citations.
npx skills add https://github.com/s-hiraoku/synapse-a2a --skill fix-conflictAutomatically resolve merge conflicts in the current PR. Fetches the base branch, attempts a merge, identifies conflicting files, analyzes both sides, resolves conflicts, verifies locally, and pushes. Use when PR has merge conflicts detected by poll-pr-status.sh. Source: s-hiraoku/synapse-a2a.
Open your terminal or command line tool (Terminal, iTerm, Windows Terminal, etc.) Copy and run this command: npx skills add https://github.com/s-hiraoku/synapse-a2a --skill fix-conflict Once installed, the skill will be automatically configured in your AI coding environment and ready to use in Claude Code, Cursor, or OpenClaw
https://github.com/s-hiraoku/synapse-a2a