{"id":43518131,"url":"https://github.com/gitkraken/merge-mate-action","last_synced_at":"2026-03-02T22:20:11.908Z","repository":{"id":335550178,"uuid":"1139858066","full_name":"gitkraken/merge-mate-action","owner":"gitkraken","description":"GitHub Action to sync PRs with target branches via rebase/merge, featuring AI-powered conflict resolution ","archived":false,"fork":false,"pushed_at":"2026-01-30T20:37:27.000Z","size":9313,"stargazers_count":0,"open_issues_count":0,"forks_count":0,"subscribers_count":0,"default_branch":"main","last_synced_at":"2026-01-31T12:33:49.046Z","etag":null,"topics":[],"latest_commit_sha":null,"homepage":"","language":null,"has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"other","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/gitkraken.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":"LICENSE","code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null,"zenodo":null,"notice":null,"maintainers":null,"copyright":null,"agents":null,"dco":null,"cla":null}},"created_at":"2026-01-22T14:07:29.000Z","updated_at":"2026-01-30T20:37:30.000Z","dependencies_parsed_at":null,"dependency_job_id":null,"html_url":"https://github.com/gitkraken/merge-mate-action","commit_stats":null,"previous_names":["gitkraken/merge-mate-action"],"tags_count":4,"template":false,"template_full_name":null,"purl":"pkg:github/gitkraken/merge-mate-action","repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/gitkraken%2Fmerge-mate-action","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/gitkraken%2Fmerge-mate-action/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/gitkraken%2Fmerge-mate-action/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/gitkraken%2Fmerge-mate-action/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/gitkraken","download_url":"https://codeload.github.com/gitkraken/merge-mate-action/tar.gz/refs/heads/main","sbom_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/gitkraken%2Fmerge-mate-action/sbom","scorecard":null,"host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":286080680,"owners_count":29047053,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2026-02-03T10:09:22.136Z","status":"ssl_error","status_checked_at":"2026-02-03T10:09:16.814Z","response_time":96,"last_error":"SSL_connect returned=1 errno=0 peeraddr=140.82.121.6:443 state=error: unexpected eof while reading","robots_txt_status":"success","robots_txt_updated_at":"2025-07-24T06:49:26.215Z","robots_txt_url":"https://github.com/robots.txt","online":false,"can_crawl_api":true,"host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":[],"created_at":"2026-02-03T14:00:44.667Z","updated_at":"2026-03-02T22:20:11.902Z","avatar_url":"https://github.com/gitkraken.png","language":null,"funding_links":[],"categories":[],"sub_categories":[],"readme":"# Merge Mate\n\nA GitHub Action that syncs pull requests with their target branches and optionally uses AI to resolve conflicts.\n\n## Prerequisites\n\n1. **Install the GitHub App** — [Install Merge Mate](https://github.com/apps/gitkraken-services) on your repository\n2. **Add workflow files** — Create the YAML files below manually (the app does not generate them automatically)\n\n## Quick Start\n\nCreate two workflow files in your repository:\n\n**`.github/workflows/merge-mate.yml`** — syncs all PRs when the target branch is updated:\n\n```yaml\nname: Merge Mate Sync\non:\n  push:\n    branches: [main]\npermissions:\n  contents: write\n  pull-requests: write\n  id-token: write\njobs:\n  sync:\n    runs-on: ubuntu-latest\n    steps:\n      - uses: gitkraken/merge-mate-action/sync@v0.2\n        with:\n          ai-provider: gitkraken\n          ai-api-key: ${{ secrets.GK_AI_PROVISIONER_TOKEN }}\n```\n\n**`.github/workflows/merge-mate-review.yml`** — handles apply/undo via PR checkbox or manual trigger:\n\n```yaml\nname: Merge Mate Review\non:\n  issue_comment:\n    types: [edited]\n  workflow_dispatch:\n    inputs:\n      pr-number:\n        description: \"PR number to process\"\n        required: true\n        type: number\n      action:\n        description: \"Action to perform\"\n        required: true\n        type: choice\n        options:\n          - apply\n          - undo\npermissions:\n  contents: write\n  pull-requests: write\n  id-token: write\nconcurrency:\n  group: merge-mate-review-${{ github.event.issue.number || inputs.pr-number }}\n  cancel-in-progress: false\njobs:\n  review:\n    if: \u003e-\n      github.event_name == 'workflow_dispatch' ||\n      (github.event.issue.pull_request \u0026\u0026 github.event.sender.type != 'Bot')\n    runs-on: ubuntu-latest\n    steps:\n      - uses: gitkraken/merge-mate-action/review@v0.2\n        with:\n          pr-number: ${{ inputs.pr-number }}\n          action: ${{ inputs.action }}\n```\n\nWhen the target branch is updated, sync runs automatically. PR comments appear with diff preview and checkboxes. You can also manually trigger apply/undo from the Actions tab using workflow_dispatch or via the Conflict viewer link in the PR message.\n\n## Features\n\n- **Flexible Sync** — Rebase (linear history) or Merge (merge commits)\n- **AI Conflict Resolution** — Automatic conflict resolution with AI\n- **Safe by Default** — AI resolutions stored in hidden refs until approved; clean rebases are applied directly\n- **Parallel Processing** — Configurable concurrency\n- **Detailed Reports** — PR comments with diffs, GitHub Summary\n\n## Sync Inputs\n\n| Input | Default | Description |\n|-------|---------|-------------|\n| `github-token` | `${{ github.token }}` | GitHub token for authentication |\n| `mode` | `rebase` | `rebase` or `merge` |\n| `pr-filter` | — | YAML filter for selecting PRs: `ids`, `target-branches`, `created`, `updated`, `authors` |\n| `concurrency` | `3` | Maximum number of PRs to process in parallel |\n| `apply-policy` | `auto` | `auto` — apply above threshold. `resolved-only` — same but skip clean rebases. `hidden-only` — always push to hidden ref. `dry-run` — no push |\n| `confidence-threshold` | `100` | Minimum AI confidence (0–100) to auto-apply. `100` = only when fully confident |\n| `comment-policy` | `conflicts` | When to post PR comments: `none` \\| `failed` \\| `resolved` \\| `conflicts` \\| `success` \\| `all` |\n| `ai-provider` | `none` | AI provider: `none` \\| `gitkraken` |\n| `ai-model` | — | AI model identifier (provider-specific) |\n| `ai-api-key` | — | API key or token for the AI provider |\n| `ai-api-base` | — | Custom API base URL |\n| `exclude-files` | see below | Newline-separated glob patterns for files to exclude from AI resolution |\n| `diff-viewer-base-url` | `https://gitkraken.dev` | Base URL for the diff viewer |\n| `gk-api-base` | — | GitKraken API base URL for OIDC token exchange |\n| `telemetry` | `true` | Enable telemetry and error tracking |\n| `log-level` | `info` | `error` \\| `warn` \\| `info` \\| `debug` |\n\n## Review Inputs\n\n| Input | Default | Description |\n|-------|---------|-------------|\n| `github-token` | `${{ github.token }}` | GitHub token for authentication |\n| `pr-number` | — | PR number to process (required for `workflow_dispatch`) |\n| `action` | — | `apply` or `undo` (required for `workflow_dispatch`) |\n| `gk-api-base` | — | GitKraken API base URL for OIDC token exchange |\n| `telemetry` | `true` | Enable telemetry and error tracking |\n| `log-level` | `info` | `error` \\| `warn` \\| `info` \\| `debug` |\n\n## Excluding Files from AI Resolution\n\nLock files are **always** excluded from AI resolution — conflicted lock files are resolved by taking the target branch version.\n\nWhen `exclude-files` is not set, the following defaults apply:\n\n| Pattern | Description |\n|---------|-------------|\n| `**/package-lock.json`, `**/pnpm-lock.yaml`, `**/yarn.lock`, `**/cargo.lock` | JS/Rust lock files |\n| `**/gemfile.lock`, `**/poetry.lock`, `**/go.sum`, `**/composer.lock` | Ruby/Python/Go/PHP lock files |\n| `**/gradle.lock`, `**/maven.lock`, `**/*.lockfile` | JVM/generic lock files |\n| `**/*.min.js`, `**/*.min.css` | Minified files |\n| `**/*.bundle.js`, `**/*.bundle.css` | Bundled files |\n| `**/*.generated.*`, `**/*.auto.*` | Generated code markers |\n| `**/*.g.dart`, `**/*.g.ts` | Dart/TS code generation |\n| `**/*.pb.go`, `**/*.pb.ts` | Protobuf generated code |\n| `**/generated/**`, `**/dist/**`, `**/build/**` | Generated/build directories |\n\nCustom patterns are **appended** to the defaults:\n\n```yaml\n- uses: gitkraken/merge-mate-action/sync@v0.2\n  with:\n    exclude-files: |\n      **/vendor/**\n      **/fixtures/**\n```\n\n## More Examples\n\nSee [EXAMPLES.md](./EXAMPLES.md) for ready-to-use workflow presets: apply policies, dry run, manual trigger, PR filtering, and more.\n\n## Versioning\n\n**For v0.x.y (pre-release):**\n\n- Pin to `@v0.2` — patches within the same minor version\n- Breaking changes may occur between minors\n\n**For v1+ (stable):**\n\n- Pin to `@v1` — all compatible updates\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fgitkraken%2Fmerge-mate-action","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fgitkraken%2Fmerge-mate-action","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fgitkraken%2Fmerge-mate-action/lists"}