Merge conflicts are one of the most expensive kinds of developer friction because they usually show up at the worst possible moment: after review, after approvals, and right before a branch is ready to land. GitHub is trying to compress that pain into a simpler workflow. Its new Fix with Copilot button on github.com asks Copilot cloud agent to resolve the conflicts after you submit a prepopulated comment.

The interesting part is not just the button. GitHub says Copilot will fix the conflicts, check that the build and tests still pass, and then push the updated result, all from its own cloud-based development environment. That moves the task away from a local machine and turns a familiar cleanup chore into an agent workflow that is closer to review delegation than to a traditional merge tool.

GitHub also used the announcement to reinforce the wider PR command surface around @copilot. In pull requests, users can ask Copilot to fix failing GitHub Actions workflows, address code review comments, or make other requested changes such as adding a missing unit test. The new conflict-resolution flow fits that broader pattern: Copilot is being positioned less as inline autocomplete and more as an operator that can take scoped requests inside an existing review thread.

Availability matters here. GitHub says Copilot cloud agent is included with all paid Copilot plans, though Copilot Business and Copilot Enterprise users still need an administrator to enable the feature. That keeps the launch from being a vague demo. It is a feature teams can actually try now, especially in repositories where merge queues and long-lived branches create constant review drag.

The real question to watch is behavioral. If teams trust Copilot to resolve conflicts and verify the branch without breaking tests, merge cleanup stops being a ritual developers hoard for themselves. It becomes another task they can hand off, review, and merge.

#merge-conflicts

GitHub turns merge-conflict cleanup into a 3-click Copilot job