Skip to content

Add merge-mate actions#4978

Merged
ianhattendorf merged 1 commit intomainfrom
add-merge-mate
Feb 17, 2026
Merged

Add merge-mate actions#4978
ianhattendorf merged 1 commit intomainfrom
add-merge-mate

Conversation

@ianhattendorf
Copy link
Copy Markdown
Contributor

@augmentcode
Copy link
Copy Markdown

augmentcode Bot commented Feb 13, 2026

🤖 Augment PR Summary

Summary: Adds GitKraken Merge Mate GitHub Actions workflows to automate PR branch syncing and apply/undo conflict resolutions.

Changes:

  • Introduces Merge Mate Sync workflow to run on main updates (and manually) and sync eligible PRs via gitkraken/merge-mate-action/sync
  • Introduces Merge Mate Review workflow to process apply/undo operations via PR comment edits or manual workflow_dispatch
  • Configures required write permissions and OIDC (id-token: write) for the action to authenticate
  • Passes GitKraken AI provisioner token for AI-assisted conflict resolution and filters PRs (targeting main, updated within 7 days)

🤖 Was this summary useful? React with 👍 or 👎

Copy link
Copy Markdown

@augmentcode augmentcode Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review completed. 3 suggestions posted.

Fix All in Augment

Comment augment review to trigger a new review at any time.

Comment thread .github/workflows/merge-mate-review.yml Outdated
Comment thread .github/workflows/merge-mate.yml Outdated
Comment thread .github/workflows/merge-mate-review.yml
Copy link
Copy Markdown
Member

@eamodio eamodio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest adding Augments guard, and then run prettier pnpm run pretty to fix the formatting.

@ianhattendorf ianhattendorf merged commit 209a168 into main Feb 17, 2026
6 checks passed
@ianhattendorf ianhattendorf deleted the add-merge-mate branch February 17, 2026 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants