- Home
- Skills
- Code Quality & Review
- Merge Conflict Intent Resolver
Works with the AI Agents you already use
Merge Conflict Intent Resolver
Resolves git merge conflicts against the intent behind each side rather than against the text, and accounts for what the resolution cost
$5
/moSubscription · cancel anytime
Secure checkout via Stripe
- Always the latest version
- Delivered live to your agent via MCP
- Cancel anytime, access ends at period end
Merge Conflict Intent Resolver
Example session with this skill installed
Merging feat/backoff into main stopped on src/http/retry.js. Which side is right? / <<<<<<< HEAD / const retryAfter = parseRetryAfter(err); / const waitMs = retryAfter !== null ? retryAfter : 1000; / ======= / const waitMs = backoffDelay(i); / >>>>>>> feat/backoff / <<<<<<< HEAD / module.exports = { withRetry, isRetryable, parseRetryAfter }; / ======= / module.exports = { withRetry, isRetryable, backoffDelay }; / >>>>>>> feat/backoff / main, fe5de90: "retry: honour Retry-After on 429. We ignored it and got rate-limited for an hour on 2026-07-14. Wait for the header when present, fall back to a flat 1s when not. Closes #412" / feat/backoff, dce024c: "retry: exponential backoff with full jitter. A flat 1000ms made all 60 workers retry in the same tick and rebuild the spike we were backing off from. Refs #438"
- Read your context and instructions
- Compiled the merge conflict intent
merge: feat/backoff into main
A = main (fe5de90) - honour Retry-After on 429, and wait a flat 1s when the header is absent (Closes #412)
B = feat/backoff (dce024c) - exponential backoff with full jitter instead of the flat 1000ms wait (Refs #438)
git is calling A "ours"
Conflicted: 1 file, 2 hunks
Resolved
- src/http/retry.js, hunk 1 (waitMs) - A wanted to "wait for the header when present, fall back to a flat 1s when not" after an hour of rate-limiting on 2026-07-14, B wanted exponential backoff with full jitter because "a flat 1000ms made all 60 workers retry in the same tick" -> now waits for the Retry-After value when parseRetryAfter returns one, and uses backoffDelay(i) instead of the flat 1s when it returns null - fe5de90 (#412), dce024c (#438)
- src/http/retry.js, hunk 2 (module.exports) - A wanted parseRetryAfter exported, B wanted backoffDelay exported -> now exports withRetry, isRetryable, parseRetryAfter and backoffDelay - fe5de90, dce024c
Loss ledger
- dropped: the flat 1s wait when no Retry-After header is present - from A, fe5de90 (#412) - because dce024c (#438) says that same flat 1000ms made all 60 workers retry in the same tick, and replacing it is the whole point of the branch being merged - restore by: putting 1000 back in place of backoffDelay(i) in the fallback, which reopens #438
- dropped: jittered backoff on retries where the server sent Retry-After - from B, dce024c (#438) - because B's line used backoffDelay(i) on every retry and ignored the header, fe5de90 says ignoring the header got you rate-limited for an hour on 2026-07-14, and dce024c never mentions Retry-After - restore by: adding jitter on top of the header value (for example retryAfter plus a jittered offset), which neither side wrote. Worth deciding, because 60 workers that get the same Retry-After will again retry in the same tick
Resolved text
src/http/retry.js
const retryAfter = parseRetryAfter(err);
const waitMs = retryAfter !== null ? retryAfter : backoffDelay(i);
module.exports = { withRetry, isRetryable, parseRetryAfter, backoffDelay };
Untraced
- src/http/retry.js, hunk 2 - neither commit message says why its helper is exported (for a test or for another caller); resolved from the code alone by keeping both exports, since dropping either one could break an importer the paste does not show
Checks
- not run: this is a pasted conflict and there is no repository here - after applying, run the project's own tests and lint, and confirm that
iandbackoffDelayare in scope where waitMs is computed (the paste does not show that), thengit add src/http/retry.jsand commit to finish the merge
State
pasted conflict not applied - the resolved text above is yours to paste over the markers
Subscription · always the latest version
- Secure checkout via Stripe
- Cancel anytime
- Delivered live via MCP
About this skill
A conflict is two people who both meant something, and --ours or --theirs is a coin toss between them. This skill reads the commits behind each side before touching a hunk, composes the two wherever both can hold, and runs your repo's checks before the commit lands - or, with no repo at hand, resolves a conflict you paste in. Either way you get a loss ledger: every behaviour that did not survive, the commit it came from, and what restoring it would take.
What it does
Resolves git merge conflicts against the intent behind each side rather than against the text, and accounts for what the resolution cost. In a repository with a merge, rebase or cherry-pick stalled on conflicts, it reads the commits and pull requests on both sides, composes the two wherever both can hold, runs the project's own typecheck, tests and formatter, and finishes the operation with a commit. Given a conflicted hunk pasted into the conversation instead, it resolves that and hands back the text. Either way you get a loss ledger: every behaviour that did not survive, the side and commit it came from, the reason it went, and what restoring it would take.
Try it first
Paste a conflicted hunk - every line from <<<<<<< to >>>>>>> - with the commit message from each side beside it, and ask which side is right. This works anywhere, with no repository open. You should get back both sides named in plain English, one Resolved line per hunk quoting the commit behind each side, the Loss ledger, and the resolved text ready to paste over the markers. Then use it for real: start a merge you expect to conflict and say "git stopped on conflicts - work through them and tell me what you had to drop". In a repository it edits the files, runs your checks and finishes the merge itself.
What it needs
For a pasted conflict, nothing - it works in any chat. For the full loop, an agent that can run shell commands and edit files - Read, Edit, Grep, Glob and Bash - inside a git repository with a merge, rebase or cherry-pick actually in progress. The GitHub CLI (gh) is optional: with it the skill reads pull request and issue bodies, without it it works from commit messages alone. No API keys, no MCP servers, no network access needed.
It can only read history that exists. A shallow clone, a squashed vendor import, a branch whose commits all say "wip", or a hunk pasted with nothing beside it leaves it resolving on the code alone, and it marks those hunks untraced rather than inventing a reason for them. A pasted conflict gets no checks: it cannot run your tests or regenerate a lockfile, so it tells you what to run after applying. Conflicts in binary files - images, compiled assets, anything git cannot diff - are not resolved; they come back to you under needs you. It does not decide whether the merge should happen at all: if you have changed your mind about that, abort it yourself before invoking. On a very large conflict, the kind a mass rename produces across a hundred files, per-hunk tracing gets slow and expensive, and it will say it is working a subset rather than pretend it read all of it. And in a repository it runs the checks in full before committing, which on a slow test suite is a wait you cannot skip.
How to use
- 1
Connect your agent to the Agensi MCP
Copy the prompt and paste it into Claude, ChatGPT, Cursor or any agent that supports MCP. It sets up the connection for you. Manual setup
- 2
Sign in to Agensi
Your agent shows a sign-in link. Sign in and click Allow.
- 3
Ask for what you need
Your agent loads this skill and uses it on your task. It always asks before any payment.
Reviews
No reviews yet
Be one of the first to try it. Every listed skill goes through the trust checks below.
Security scanned
Checked by our 8-point scan before listing
Fresh listing
Recently published to Agensi
Free forever
No account required to browse
Trust & safety
Security scan
Security scan passed 1 month ago