v0.3.0

[0.3.0] - 2026-04-20

Added

• Self-update command — run merge-mate self-update to upgrade the CLI to the latest version without reinstalling.
• Per-chunk conflict resolution — conflict resolver now picks the best strategy independently for each chunk, improving resolution quality on mixed conflicts.

Fixed

• Empty rebases now report unavailable application status instead of a misleading success.
• Resolved file counts no longer double-count when the resolver falls back to another strategy.
• Backup ref is preserved across repeated syncs, so undo works reliably and repeated syncs don't degrade into rebase-of-rebase.

v0.2.8

[0.2.8] - 2026-04-01

Fixed

• Login command broken in release builds — the authentication URL was missing from production CLI binaries, causing merge-mate login to fail silently
• Rebase silently dropping commits — when the AI resolver couldn't parse its output, subsequent commits in the rebase were lost without any error; the fallback resolver now kicks in automatically
• Incorrect rebase/merge completion detection — the CLI could report a rebase or merge as finished while it was still in progress, leading to inconsistent repository state

v0.2.7

[0.2.7] - 2026-03-30

Fixed

• Telemetry identity mapping — device and account identifiers now use OTEL-compliant attribute names, fixing Amplitude user/device attribution that was silently ignored in previous versions

v0.2.6

[0.2.6] - 2026-03-26

Added

• resolve command — resolve conflicts in an already in-progress rebase or merge using AI, without re-running the full sync
• login / logout commands — authenticate with GitKraken via CLI instead of manually managing API keys in environment variables
• Update check notifications — CLI warns on startup when a newer version is available
• Branch picker filtering — --base flag hides stacked branches from the interactive picker, showing only direct children of the target base
• Stale artifact detection — CLI detects leftover rebase/merge state and shows an actionable recovery message instead of a cryptic error
• Default AI model switched to Gemini 3 Flash Preview — faster and cheaper conflict resolution out of the box

Fixed

• Already-applied commits no longer cause conflicts — cherry-picked commits are detected and skipped during rebase
• False-positive stacked branch detection — branches that share a merge-base but aren't actually stacked are no longer incorrectly filtered out
• Correct model name in sync reports — reports now show the actual model used instead of a hardcoded placeholder
• Branches with undetectable parents reported clearly — instead of silently skipping, these branches now surface an explicit error with context
• Actionable hint when no branches qualify — when all branches fall below the confidence threshold, the CLI explains why and suggests next steps

Changed

• Fallback warnings visible in output — when AI resolution falls back to git merge, the reason is now shown in the task title and summary instead of being silently swallowed

v0.2.5

[0.2.5] - 2026-03-11

Fixed

• Linked worktree support — CLI no longer fails when run inside a linked git worktree; .git file indirection is now resolved correctly
• Telemetry in production builds — telemetry and error reporting were silently disabled in release builds due to missing build-time defines

v0.2.4

[0.2.4] - 2026-03-10

Fixed

• Merge base detection in shallow clones — previously the tool could silently fall back to HEAD~1 when merge base was unavailable, producing incorrect results; now it fails fast with a clear error and a hint to fetch more history

v0.2.3

[0.2.3] - 2026-03-09

Added

• Commit signature warnings — CLI warns when rebase or merge may strip GPG/SSH commit signatures from your history
• resolved-only apply policy — new policy that applies only files where all conflicts were resolved, skipping unresolved ones

Fixed

• Cleaner error messages — model creation errors and AI provider failures now show readable messages instead of raw stack traces
• Correct three-way diff for rebases — counterpart ref is now resolved dynamically, fixing incorrect conflict context in rebase scenarios
• Accurate commit context for AI — commit messages are now retrieved reliably, improving AI resolution quality
• Line ending preservation — files with CRLF endings are no longer silently converted to LF during resolution
• Environment variable passthrough — git operations now inherit the parent process environment, fixing issues with custom git configs and credentials
• Balanced AI resolutions — removed bias toward incoming changes in the AI system prompt

Changed

• hidden-only policy renamed to review — the apply-policy value hidden-only is now review for clarity
• Caching removed — the --cache flag and git rerere integration have been disabled

v0.2.2

[0.2.2] - 2026-03-05

Fixed

• Empty rebase safety guard — when a rebase produces zero commits (all dropped), the CLI now skips branch ref updates and auto-apply instead of silently overwriting the branch with the base

v0.2.1

[0.2.1] - 2026-03-04

Added

• --no-cache flag — Disable git rerere cache to force fresh conflict resolution on every run
• AI resolution retry — AI resolver automatically retries when the model returns a text-only response instead of structured output

Fixed

• Delete/modify conflicts in rebase — Rebase fallback now correctly handles conflicts where one side deletes a file and the other modifies it
• Simplified install script URLs — Install scripts now use the correct tag format for downloading releases

v0.2.0

[0.2.0] - 2026-03-02

First release of Merge Mate CLI.

Highlights

• AI conflict resolution — run merge-mate rebase or merge-mate merge and let AI handle conflicting files while you focus on the code
• Multiple AI providers — choose between GitKraken, OpenRouter, or local Ollama models depending on your privacy and cost preferences
• Smart resolution strategies — trivial conflicts (lockfiles, one-sided changes) are resolved instantly without spending AI tokens; complex conflicts get full contextual analysis
• Codebase-aware resolver — the AI searches your working tree for context, producing merges that respect your project's patterns
• Built-in caching — git rerere integration remembers past resolutions so the same conflict is never solved twice
• Cross-platform — single install command for macOS, Linux, and Windows