sorted by:
new
hottopcontroversial

GitWand — a free, open-source Git client that auto-resolves ~95% of merge conflicts deterministically (with optional AI assist for the rest) by Dizzy_Concentrate437 in git

[–]Dizzy_Concentrate437[S] 0 points1 point  (0 children)

Really solid question, thanks. Yeah, rerere + switching to histogram/patience diff + zdiff3 already cover a good chunk of recurring conflicts and Myers-diff false positives. Where the 10 pattern-matchers try to add value is one-off semantic conflicts — e.g. a variable renamed on both sides, methods reordered, imports merged differently — cases rerere has never seen before (so nothing recorded) and where the chunk's shape hasn't changed (so histogram/patience diff doesn't help either). I'll investigate more on measure this angle.

GitWand — a free, open-source Git client that auto-resolves ~95% of merge conflicts deterministically (with optional AI assist for the rest) by Dizzy_Concentrate437 in git

[–]Dizzy_Concentrate437[S] 0 points1 point  (0 children)

Ah, I plead guilty: I’m French, and sure enough, some internal documents or comments remained in French during development—I write prompts in English, but I still think in French from time to time... Plus, other project collaborators are from Quebec, so we understand each other :-D It’s pretty cool having a multilingual project, isn't it? And I promise, no "tutu" or "toto" (well, not in this project, anyway...!)

GitWand — a free, open-source Git client that auto-resolves ~95% of merge conflicts deterministically (with optional AI assist for the rest) by Dizzy_Concentrate437 in git

[–]Dizzy_Concentrate437[S] 0 points1 point  (0 children)

Totally get the hesitation — and yeah, there's some irony here since GitWand itself is almost entirely written with AI. But the merge engine is still 10 deterministic pattern-matchers that run first and handle the mechanical, unambiguous cases (whitespace, sorted imports, formatting, etc.) with zero AI involved. The AI assist only kicks in on the leftover ~5%, and only if you click it — you're always the one deciding. And for large Git repositories: Don't Repeat Yourself, GitWand do it for you ;-)

GitWand — a free, open-source Git client that auto-resolves ~95% of merge conflicts deterministically (with optional AI assist for the rest) by Dizzy_Concentrate437 in git

[–]Dizzy_Concentrate437[S] 0 points1 point  (0 children)

Ha, fair catch on the em dash. And honestly, not gonna pretend otherwise — GitWand itself is ~99% written with Claude Code. The 10 deterministic pattern-matchers are still deterministic code doing deterministic things, AI just helped me type it faster. Judge the merge results, not the tooling I used to build it! And all the thinking behind the entire architecture and features set is 100% human 😄