GitHub Copilot Cloud Agent: Fix Merge Conflicts in 3 Clicks

GitHub's Copilot cloud agent now fixes merge conflicts in three clicks and handles failing tests, code reviews, and custom PR changes via @copilot mentions.

GitHub Copilot Cloud Agent: Fix Merge Conflicts in 3 Clicks

TL;DR

  • New "Fix with Copilot" button resolves merge conflicts automatically on github.com
  • Copilot cloud agent now handles failing tests, code review comments, and custom PR changes via @copilot mentions
  • Available on all paid Copilot plans; Enterprise/Business users need admin enablement

New

  • Fix with Copilot button — One-click merge conflict resolution that auto-runs tests and pushes changes from Copilot's cloud environment.
  • @copilot mentions in PRs — Ask Copilot to fix failing workflows, address review comments, or make arbitrary code changes directly in pull request threads.

How It Works

  • Click "Fix with Copilot" on a conflicted PR, submit the prepopulated comment, and Copilot resolves conflicts, validates the build and tests pass, then pushes automatically.
  • Use @copilot Fix the failing tests, @copilot Address this comment, or any custom instruction to trigger changes without leaving the PR.

Availability

  • All paid Copilot plans (Pro, Business, Enterprise) have access to the cloud agent feature.
  • Copilot Business and Enterprise admins must explicitly enable Copilot cloud agent before team members can use it.

Update: Enable Copilot cloud agent in your GitHub organization settings or upgrade to a paid Copilot plan. See the GitHub docs on making changes to existing PRs for full details.

Source: GitHub Changelog