GitHub Copilot Cloud Agent: One-Click Merge Conflict Resolution
GitHub CopilotGitHub has introduced a dedicated "Fix with Copilot" button in the pull request merge box, enabling developers to resolve merge conflicts in three clicks without leaving github.com. When clicked, the Copilot cloud agent takes over in its own cloud environment — fixing conflicts, verifying the build and tests still pass, and pushing the resolved code automatically. The feature complements the existing @copilot mention workflow and is available to all paid Copilot plan subscribers.
Sources & Mentions
2 external resources covering this update
Overview
GitHub has shipped a dedicated merge conflict resolution button powered by Copilot cloud agent, making it possible to clear blocking conflicts directly from the pull request page on github.com — no local checkout, no manual rebasing required.
The "Fix with Copilot" Button
When a pull request has merge conflicts, a "Fix with Copilot" button now appears in the merge box alongside the existing conflict warning. Developers click the button, submit the pre-populated comment that appears in the comment box, and Copilot handles the rest from there.
Behind the scenes, the Copilot cloud agent spins up its own isolated cloud environment, resolves the conflicts, runs the repository's build and test suite to confirm nothing broke, and then pushes the fixed branch. Once complete, it requests a review from the author so the resolution can be verified before merging.
How It Differs from the @copilot Mention
GitHub introduced the ability to mention @copilot in pull request comments back in March 2026, which already allowed agents to tackle merge conflicts through natural-language instructions. The new button makes the same capability significantly more accessible — it surfaces exactly where the conflict is visible (the merge box) and pre-populates the request, removing the need to know the @copilot syntax at all.
Extended Agent Capabilities
Beyond merge conflicts, the same cloud agent invoked by the button can be asked to:
- Resolve failing GitHub Actions workflows
- Respond to code review feedback
- Add unit tests or implement any other custom development task
All of these use the same @copilot mention pattern in pull request comments.
Availability
The "Fix with Copilot" button and the underlying cloud agent are available with all paid GitHub Copilot plans (Pro, Business, and Enterprise). Copilot Business and Enterprise organizations require an administrator to enable Copilot cloud agent before the button appears for team members.