You can now fix merge conflicts in three clicks with the new Fix with Copilot button on github.com, powered by Copilot cloud agent.

Click the button, and a comment is prepopulated in the comment box asking Copilot to resolve conflicts.

When you submit the comment, Copilot fixes the conflicts, checks that the build and tests still pass, and pushes. And it does all this from its own cloud-based development environment.

You can also mention @copilot in pull requests to:

  • 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 cloud 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 cloud 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.