v0.3.0

[0.3.0] - 2026-04-20

Added

• Apply/undo action buttons — PR comments now show clickable image buttons for applying and reverting rebases, replacing the previous checkbox UI.
• Mention-based commands — Apply or undo a rebase by @-mentioning the bot in a PR comment as an alternative to clicking the buttons.
• Per-chunk conflict resolution strategies — Each conflict chunk is now resolved with its own tailored strategy, improving AI resolution quality on mixed-complexity conflicts.

Fixed

• Backup ref lost on repeated syncs — The pre-rebase backup reference is now preserved across repeated syncs, so rollback always points to the correct original state.

Migration from v0.2

The apply/undo UX moved from checkbox edits to image buttons and mention commands, which requires updating merge-mate-review.yml:

• Change trigger: issue_comment: types: [edited] → types: [created]
• Add permission: issues: write
• Add workflow_dispatch input trigger-mode and pass it via with: trigger-mode:
• Change pr-number: ${{ inputs.pr-number }} → pr-number: ${{ github.event.issue.number || inputs.pr-number }}
• Bump action ref @v0.2 → @v0.3

See the updated Quick Start in README for the full workflow.

v0.2.8

[0.2.8] - 2026-04-01

Added

• Commit signing — Automatically detects signed commits on the branch, evaluates branch protection policies, and signs rebased commits via SSH when required; PR comments now include signing status and manual push recovery instructions

Fixed

• Commits silently dropped when AI resolution was skipped — When the AI resolver failed to parse its output, unresolved files left the rebase in a broken state causing all subsequent commits to be lost; the fallback resolver is now always invoked
• Rebase and merge reporting false completion — Operations could report as finished without verifying actual git state, potentially leaving the rebase stuck mid-way

Changed

• Fork token authentication uses PR-scoped API — Fork installations are now resolved from the PR number directly, improving reliability for fork-based workflows
• Committer identity preserved on non-signing rebases — Rebased commits now retain the original committer instead of being overwritten with the action's configured identity

v0.2.7

[0.2.7] - 2026-03-30

Fixed

• Sync without AI key — The action no longer fails when ai-api-key is omitted, enabling rebase-only workflows without AI conflict resolution

v0.2.6

[0.2.6] - 2026-03-26

Added

• Fork push support — sync results can now be pushed to fork repositories with automatic token resolution, reviewable refs for the review sub-action, and clear diagnostics when fork access is unavailable
• Default AI model switched to Gemini 3 Flash — faster and more cost-effective conflict resolution out of the box

Fixed

• Clean PRs no longer trigger unnecessary git operations — PRs that GitHub confirms as cleanly rebaseable are now skipped, with stacked children still force-processed when a parent changes (AGP-216)
• Already-applied commits are detected and skipped — cherry-pick detection prevents errors when re-syncing branches that partially overlap with the target
• Commit author now reflects the actual token owner — bot identity is resolved from the authentication token instead of being hardcoded, with a safe fallback to the default bot
• Partial results preserved when a PR fails mid-run — accumulated resolutions and usage are no longer lost if the orchestrator encounters an error partway through
• Subject-matching fallback validates changed files — prevents false matches when commit subjects collide but touch different files
• Workflow examples include concurrency group — prevents overlapping sync runs on the same PR

Changed

• ai-api-key is now a required input — the non-AI workflow path has been removed; omitting the key now fails early with a clear message instead of a cryptic 401
• gk-api-base input removed — API endpoint is now resolved internally

v0.2.5

[0.2.5] - 2026-03-11

Fixed

• Linked worktree support — the action now correctly resolves the .git path in linked worktrees, fixing failures when running rebase or merge detection in worktree-based workflows

v0.2.4

[0.2.4] - 2026-03-10

Fixed

• Shallow clone merge-base detection — fixed false conflicts and excessive token usage caused by a silent HEAD~1 fallback when the real merge base was unreachable; the action now fails fast with a clear error message suggesting to increase fetch depth

v0.2.3

[0.2.3] - 2026-03-09

Fixed

• Balanced AI conflict resolution — removed an internal bias toward the incoming ("theirs") side, producing more accurate merge results
• Correct conflict context for rebases — fixed commit message retrieval and counterpart ref resolution so the AI sees the right context during rebase conflicts
• Line endings preserved — files with CRLF line endings are no longer silently converted to LF during conflict resolution
• Fork PR sync no longer fails — gracefully handles the case where pushing sync refs to a fork repository is not permitted
• AI provider errors surface clearly — error cause chains are now preserved and raw stack traces are suppressed in error output
• Git inherits full environment — git operations now receive the parent process environment, fixing issues with missing credentials or custom config

Changed

• hidden-only apply-policy renamed to review — the previous name is no longer accepted; clean rebases without conflicts are now correctly skipped instead of producing an empty report

v0.2.2

[0.2.2] - 2026-03-05

Fixed

• Empty rebase no longer auto-closes the PR — when all commits are silently dropped during rebase (e.g. already-applied changes), the action now detects this and skips the push instead of force-pushing a branch identical to base
• Rollback now restores the correct state — backup ref was incorrectly storing the post-rebase HEAD; it now preserves the original pre-rebase SHA so the undo checkbox actually works

Changed

• Simplified PR commenting — removed the comment-policy input; comments are now posted automatically whenever a push occurs or an error happens, and clean rebases now include the rollback checkbox too

v0.2.1

[0.2.1] - 2026-03-04

Added

• Fork PR support — Fork pull requests are now properly synced; when automatic push isn't available, the PR comment includes manual git commands to apply changes
• Team-based author filtering — authors input in pr-filter now accepts @org/team-slug to filter PRs by GitHub team membership
• 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

Changed

• Faster repository cloning — Optimized clone strategy reduces setup time for the sync action

v0.2.0

[0.2.0] - 2026-03-02

Added

• Confidence threshold for auto-apply — new confidence-threshold input (0–100) controls the minimum AI confidence required to automatically push resolved branches to PR

Changed

• Breaking: redesigned action inputs — renamed push-strategy → apply-policy, pr-comment-strategy → comment-policy, max-concurrent → concurrency, exclude-from-ai → exclude-files; removed clone-depth, ai-request-limit, and granular telemetry/sentry inputs. Existing workflows using old input names must be updated.
• Redesigned apply policies — apply-policy now uses auto, resolved-only, hidden-only, and dry-run instead of the previous branch-oriented push strategies
• Simplified telemetry and outputs — consolidated telemetry into a single telemetry toggle, removed action outputs