A merge conflict can block a pull request while you are away from a laptop. Resolving it from a phone is convenient, but the small screen makes semantic mistakes easier to miss than syntax mistakes.

Quick answer

Use the mobile Copilot workflow for small, well-understood conflicts with strong CI. Review the complete resulting diff, not only the conflict markers, and move to a desktop for generated files, schema changes, lockfiles, or overlapping business logic.

mobile-safe:
  - comments or documentation
  - independent import additions
  - formatting with reliable CI
desktop-required:
  - migrations
  - lockfiles
  - authorization logic

what changed

GitHub Mobile can now ask the Copilot cloud agent to resolve pull request merge conflicts. This helps unblock agent-assisted pull requests without requiring the original session to remain open on a desktop.

This is a current platform change, so confirm availability for your plan, organization, and installed client before changing a production workflow. Preview features can also change faster than generally available controls.

who should use it

The feature is best for mechanical conflicts where the intended combined state is obvious. A conflict between two correct business-rule changes requires context, tests, and ownership that an automated merge cannot infer safely.

The practical question is whether the feature removes a real bottleneck or security gap in your workflow. A new control is not valuable merely because it exists; it needs an owner, a narrow purpose, and an observable result.

a safe implementation

  1. Read both conflicting changes and their pull-request descriptions.
  2. Let the agent propose a resolution.
  3. Inspect the entire changed file.
  4. Wait for required checks and request domain review when behavior changed.

Make the first rollout small enough to reverse. Record the previous behavior, the setting or command that changed it, and the person responsible for deciding whether the experiment expands.

the mistake to avoid

Do not approve because conflict markers disappeared. A syntactically valid merge can silently remove one branch’s validation, error handling, or feature flag.

Convenience features still operate inside your existing trust model. Repository permissions, protected environments, review rules, test accounts, and audit logs remain important even when the new workflow removes manual steps.

how to verify it

Confirm CI runs on the resolved commit, compare behavior against both original branches, and check that no unrelated files changed. Reopen the work on desktop when the diff cannot be understood comfortably on mobile.

Keep the verification evidence in the pull request or rollout ticket. That gives reviewers something concrete to evaluate and gives the next person a known baseline when the platform changes again.

rollout checklist

  • Confirm the feature and client version are available.
  • Test with non-production data and minimum permissions.
  • Capture expected success and failure behavior.
  • Document rollback and ownership.
  • Recheck the official announcement before a wide rollout.

official reference

The announcement is the source of truth for availability and product behavior. This article focuses on the implementation decisions teams should make around it.