Open
Conversation
There was a problem hiding this comment.
Pull request overview
Updates the MergAI conflict-resolution workflow to support using Claude (via Claude Code CLI) as the agent, and adds workflow inputs to override the MergAI ref and agent at runtime.
Changes:
- Switch default resolve agent in
.mergai/config.ymltoclaude-cli:claude-opus-4-5. - Extend the
mergaiGitHub Actions workflow to optionally pass an--agentoverride and configure a selectable MergAI ref. - Add optional installation/configuration of Claude CLI (Node-based) and expose a Claude API key input in the workflow setup composite action.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
.mergai/config.yml |
Changes default conflict-resolution agent to Claude. |
.github/workflows/mergai.yml |
Adds dispatch inputs and passes agent/ref into the workflow execution. |
.github/actions/setup-mergai/action.yml |
Cleans up the checked-out mergai tool directory after installing via pipx. |
.github/actions/setup-mergai-workflow/action.yml |
Adds optional Claude CLI install and API key export; updates Node setup conditions. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Add setup-claude and claude-api-key inputs to setup-mergai-workflow action - Install @anthropic-ai/claude-code CLI when setup-claude is enabled - Enable Claude in the main mergai workflow with CLAUDE_API_KEY secret - Clean up mergai checkout directory after installation to avoid untracked files - Switch mergai-ref to claude branch for Claude integration testing
Fix Python version to 3.13 to match pyproject.toml requirements.
plebioda
force-pushed
the
PSMDB-2026-use-claude-in-merging-workflow
branch
from
6702cae to
972a15d
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.