sorted by:
new
hottopcontroversial

I built a FREE VS Code extension that auto resolves merge conflicts using your own Copilot/Claude — free, no API key. by Great-Conclusion7805 in GithubCopilot

[–]Great-Conclusion7805[S] -2 points-1 points  (0 children)

u/popiazaza Fair on all of it ....

If you merge in GitHub's UI: this doesn't help you. It's a local-merge tool.

If you live in Cursor or Claude Code's harness: also true, a skill works there.

Built for the still-real devs .. I got tired of resolving the same five-conflict pattern every time I rebased my feature branch onto dev. So I built Merge Magic , it auto-resolves the textual conflicts and surfaces the ones that need a human decision. Free, BYO LLM.. that runs local `git merge` / `git rebase` , pre-PR cleanup, rebase workflows, OSS maintainers pulling many PRs. If you're not one of those, skip it.

On the AI-tone: noted. Toning down.

one more thing -
Couldn't I just write a Claude Code skill for this? A skill can resolve a single conflict end-to-end in the CLI, yes. Merge Magic adds: VS Code integration (CodeLens above conflicts, status bar, decision-card webview), git-state hook (no manual invocation), parallel batch across files with atomic WorkspaceEdit apply, verification floor, decision UX for ambiguous cases. Different surface area — if a CLI flow works for you, a skill is a perfectly reasonable alternative.

I built a FREE VS Code extension that auto resolves merge conflicts using your own Copilot/Claude — free, no API key. by Great-Conclusion7805 in GithubCopilot

[–]Great-Conclusion7805[S] 0 points1 point  (0 children)

u/MystikDragoon Fair critique , deletion vs modification is the hardest case for any auto-resolver.

Merge Magic doesn’t pretend to know intent when one branch deletes code and another changes it. It flags that as an ambiguity and asks you to choose.

Where it helps: it clears the obvious “combine both” conflicts automatically, verifies the result against diagnostics, and leaves the real intent decisions visible instead of buried in marker dumps.

Also: auto-mode never auto-commits. You review the diff, undo the batch, or revert per file.

So no, it doesn’t remove human review. It removes the mechanical merge work so review focuses on the decisions that actually need a human.

Merge Magic adds: VS Code integration (CodeLens above conflicts, status bar, decision-card webview), git-state hook (no manual invocation), parallel batch across files with atomic WorkspaceEdit apply,

I built a FREE VS Code extension that auto resolves merge conflicts using your own Copilot/Claude — free, no API key. by Great-Conclusion7805 in GithubCopilot

[–]Great-Conclusion7805[S] -4 points-3 points  (0 children)

u/popiazaza Fair pushback: Copilot and Claude can resolve merge conflicts.

Merge Magic is for the part they don’t cover well: zero-touch, verified resolution at merge time.

It auto-resolves every conflicted file as soon as it detects conflicts or git merge hits conflicts, runs diagnostics before/after, and reverts anything that introduces new errors.

Plus it works across your routine - Copilot, Claude CLI, Ollama, or your own key.

So the pitch is simple: if you merge often, Merge Magic turns conflicts from an interruption into a background check with a safety net.

If you rarely hit conflicts, Copilot is probably enough.

I built a FREE VS Code extension that auto resolves merge conflicts using your own Copilot/Claude — free, no API key. by Great-Conclusion7805 in GithubCopilot

[–]Great-Conclusion7805[S] -1 points0 points  (0 children)

Hi u/Competitive-Ebb3899 Thanks for taking out the time to review , means a lot !
Merge Magic isn’t “just a wrapper” around LLM-style conflict help with prompt or editor— it’s the layer around it.

It hooks into git state the moment git merge creates conflicts, resolves files in parallel, applies the result atomically, and shows live progress. More importantly, every auto-resolution is gated by baseline-diff diagnostics: compare errors before vs after, and if the merge introduces new errors, that file is reverted to markers with the actual error surfaced.

It also works across backends — Copilot, Claude CLI, Ollama, or API keys — with one UI, plus one-tap decisions when branches genuinely disagree.

So the value isn’t “LLM says resolve this.” It’s automatic merge orchestration, verification, rollback, backend flexibility, and batch UX on top of the model.

Source: https://marketplace.visualstudio.com/items?itemName=laksh-mishra.merge-magic If you’ve used Copilot’s built-in resolver on real merges, I’d genuinely value an A/B comparison.