releases.shpreview
GitHubGitHub/GitHub Desktop

Copilot conflict resolution tab added; nudge to enable permanently

release-3.5.13-beta2

June 17, 2026GitHub DesktopView original ↗
3 features1 fixThis release3 featuresNew capabilities1 fixBug fixesAI-tallied from the release notes

Added

  • Add 'Always use Copilot when conflicts are detected' setting and a nudge dialog that appears after five manual uses to encourage enabling it - #22285
  • Add the Copilot conflict resolution Changes tab, allowing users to see a diff of Copilot's suggested resolution - #22333
  • Allow users to stop an ongoing request to generate a commit message with Copilot - #22324. Thanks @say25!

Fixed

  • Fix Warp terminal detection on Windows to support the new Warp registry path with fallback to the legacy path - #22264. Thanks @Cocodrulo!

Fetched June 17, 2026