20 / 1788

GitHub Mobile: Fix merge conflicts with Copilot cloud agent

TL;DR

GitHub Mobile can now trigger merge-conflict fixes in pull requests through Copilot cloud agent. The entry point appears in the merge box of an affected PR. Users tap Fix with Copilot; GitHub prepopulates a comment asking Copilot to resolve the conflicts. Submitting it launches the cloud agent workflow. The app shows merge-conflict alerts, success or error feedback, and still supports regular @copilot comments for failing Actions, review comments, tests and follow-up code changes.

Nauti's Take

Useful, but the announcement is PR-heavy: fixing merge conflicts from a phone sounds magical, while GitHub is mostly launching a prefilled Copilot task. The value is not mobile typing; it is unblocking small, clear conflicts faster.

For complex conflicts, a phone is still the wrong place to make architecture decisions. Good teams will use this as acceleration, not as a substitute for review discipline.

Briefingshow

This is not a huge IDE breakthrough, but it removes a real bit of workflow friction: blocked PRs do not always have to wait for someone at a laptop. It also pushes more maintainer work into asynchronous agent flows. The important part is whether teams review Copilot changes properly instead of treating conflict resolution as autopilot.

Sources