megachangelog
Feature

Fix merge conflicts with Copilot cloud agent

GitHub Mobile now supports fixing pull request merge conflicts with Copilot cloud agent, allowing developers to resolve conflicts and unblock pull requests directly from mobile.

GitHub Mobile now supports fixing pull request merge conflicts with Copilot cloud agent, making it easier to unblock pull requests while you’re on the go.

When a pull request has merge conflicts, you can now start the Copilot workflow directly from the pull request merge box on mobile. Tap Fix with Copilot to prepopulate a comment asking Copilot to resolve the conflicts, then submit it to launch Copilot cloud agent.

This brings the streamlined “fix merge conflicts” experience to GitHub Mobile, so you can:

  • View merge conflict alerts in the mobile app.
  • Start Copilot cloud agent from the pull request merge box.
  • Ask Copilot to resolve conflicts with a prefilled prompt.
  • Get clear feedback when the request succeeds or if something goes wrong.

You can also continue to mention @copilot in pull request comments to ask Copilot to help with other tasks, such as:

  • Fixing failing GitHub Actions workflows.
  • Addressing code review comments.
  • Adding tests or making follow-up code changes.

This is now available on the latest production build of GitHub Mobile on iOS and Android.

Join the discussion within GitHub Community.

The post GitHub Mobile: Fix merge conflicts with Copilot cloud agent appeared first on The GitHub Blog.

mobilecopilotmerge-conflictspull-requestsai

Source: original entry ↗

More from GitHub

Follow GitHub to get its new changes in your feed and email digest.

Announcement

Claude Haiku 5.5 now available in GitHub Copilot

Claude Haiku 5.5, Anthropic's lightweight model, is now generally available in GitHub Copilot for fast, high-volume tasks like subagents, quick edits, and terminal operations.

copilotaimodelsannouncement
Feature

Purpose-built model for leaked secret detection

GitHub introduced a new purpose-built model for detecting leaked secrets that provides context-aware detection to keep pace with modern software development practices, including AI-assisted coding.

securitysecret-detectionaiprotection
Announcement

Local sandboxing for GitHub Copilot now generally available

GitHub Copilot's local sandboxing feature is now generally available across GitHub Copilot CLI, the GitHub Copilot app, and VS Code sessions using Agent Host, providing developers with a secure environment for testing and development.

copilotaisecuritysandboxvscode
See all GitHub changes →