Improvement

March 26, 20261 Minute Read

Ask @copilot to resolve merge conflicts on pull requests

Copilot coding agent can now resolve merge conflicts on pull requests.

To ask Copilot to resolve merge conflicts, mention @copilot in a comment and tell it what to do: @copilot Merge in main and resolve the conflicts.

The agent works in its own cloud-based development environment where it can make the changes, check that the build and tests still pass, and then push.

Copilot coding agent can also:

  • Fix failing GitHub Actions workflows: @copilot Fix the failing tests
  • Address code review comments: @copilot Address this comment
  • Make any other changes: @copilot Add a unit test covering the case when the model argument is missing

Copilot coding agent is available with all paid Copilot plans. If you’re a Copilot Business or Copilot Enterprise user, an administrator will have to enable Copilot coding agent before you can use it.

To learn more, see “Asking GitHub Copilot to make changes to an existing pull request” in the GitHub docs.

Subscribe to our developer newsletter

Discover tips, technical guides, and best practices in our biweekly newsletter just for devs.

By submitting, I agree to let GitHub and its affiliates use my information for personalized communications, targeted advertising, and campaign effectiveness. See the GitHub Privacy Statement for more details.

Ask @copilot to resolve merge conflicts on pull requests - GitHub Changelog