u/Dizzy_Concentrate437

Hey r/git, I'm the developer of GitWand (https://gitwand.app/), an open-source Git client I built to auto-resolve merge conflicts. It's a native app (macOS/Linux/Windows, ~8MB, no Electron) that classifies every conflict hunk using 10 deterministic patterns first, so most conflicts are resolved without any AI involved. For the trickier ~5%, you can ask an AI assistant to help in one click. It's 100% local, free, MIT-licensed, no account required, and telemetry is anonymous and GDPR-compliant. It also ships a full Git client (commit graph, diffs, PRs, worktrees) and an MCP server for AI agents like Claude Code or Cursor. Curious what this community thinks of the deterministic-pattern approach vs. AI-based conflict resolution.