Merge Conflicts - 1

2026 (2)

April (1)

github: Fix merge conflicts in three clicks with Copilot cloud agent

GitHub

2026-04-13

GitHub added a new "Fix with Copilot" button on github.com for resolving merge conflicts, powered by Copilot cloud agent. The feature lets users fix conflicts from a comment flow in three clicks.

March (1)

github: Ask @copilot to resolve merge conflicts on pull requests

GitHub

2026-03-26

GitHub Copilot coding agent can now resolve merge conflicts on pull requests. Users can trigger it by mentioning @copilot in a PR comment and asking it to handle the conflicts.