Fixing merge conflicts and PRs with Copilot cloud agent | GitHub Checkout
GitHub walks through what’s new in Copilot Cloud Agent, including how it can handle PR work in private sessions, fix merge conflicts when you mention @copilot, and how you can adjust security and test-related settings. The video also previews upcoming capabilities like automatic CI/CD fixes and a public API.
Full summary based on transcript
What the episode covers
The presenter (Tim Rogers) demonstrates Copilot Cloud Agent workflows aimed at reducing PR cleanup work:
- Resolving merge conflicts
- Handling failing tests and messy PRs
- Running work in private sessions before opening a PR
- Choosing between models
- Configuring security and test settings
Exploring the agents tab and model options
The presenter explores the agents experience in GitHub and highlights:
- An agents tab/workflow for assigning tasks to Copilot Cloud Agent
- The ability to choose which model Copilot uses (model choice)
Private sessions before opening a PR
The video explains how Copilot Cloud Agent can:
- Work on tasks and PR-related changes in a private session
- Let you iterate before opening a PR, reducing noise in the main PR discussion
Fixing merge conflicts and editing code with @copilot
The presenter demonstrates the interaction pattern where you can:
- Mention
@copilotto request code edits - Ask Copilot to fix merge conflicts (e.g., “fix the merge conflicts”)
- Have Copilot apply changes as part of the PR workflow
Customizing security and test settings
The video calls out configuration controls for how the agent operates, including:
- Security-related settings
- Test-related settings (to help ensure changes don’t break the build)
Sneak peek: automatic CI/CD fixes and a public API
The presenter previews upcoming features, including:
- Automatic fixes for CI/CD issues
- A public API for Copilot Cloud Agent