GitHub · 2026-04-13 · notable
GitHub Copilot Cloud Agent — Fix Merge Conflicts in Three Clicks
GitHub adds a 'Fix with Copilot' button on github.com that resolves merge conflicts automatically — the cloud agent fixes conflicts, validates builds and tests, and pushes the resolution from its own environment.
GitHub's Copilot cloud agent now fixes merge conflicts directly on github.com — click a button, and it resolves, tests, and pushes.
Key specs
| Clicks to resolve | 3 |
|---|
What is it?
GitHub added a 'Fix with Copilot' button that appears on pull requests with merge conflicts on github.com. When clicked, it prepopulates a comment asking Copilot to resolve the conflicts. The Copilot cloud agent then runs in its own cloud-based development environment — it fixes the conflicts, validates that builds and tests still pass, and pushes the resolution automatically.
How does it work?
The feature uses GitHub's Copilot cloud agent infrastructure. When you click the button on a conflicted PR, a comment is prepopulated asking Copilot to resolve the conflicts. Once submitted, the agent analyzes the conflicting changes, determines the correct resolution, runs the project's test suite to validate the fix, and pushes the result. You can also @mention Copilot in PR comments to fix failing CI workflows, address code review comments, or make custom modifications like adding unit tests.
Why does it matter?
Merge conflicts are one of the most tedious parts of collaborative development. While the actual resolution is often straightforward, the context-switching cost of pulling, resolving locally, testing, and pushing is high. This feature keeps developers in their flow state on github.com while the agent handles the mechanical work in the background.
Who is it for?
Teams using GitHub for collaborative development who want to resolve merge conflicts without leaving the browser.
Try it
Look for 'Fix with Copilot' button on conflicted PRs on github.com (requires Copilot Business/Enterprise with cloud agent enabled)