GitHub Desktop 3.6: Worktrees, Copilot for Commits and Conflicts
GitHub Desktop 3.6 enhances Git workflows by integrating GitHub Copilot for commit authoring and merge conflict resolution, leveraging the new Copilot SDK. It also introduces Git worktree support, enabling parallel work across multiple branches. This update aims to streamline development by keeping users in their flow, especially when using AI coding assistants. The release is available now for macOS and Windows, with Copilot features requiring a GitHub Copilot subscription.
- →Copilot SDK powers new commit and conflict features
- →AI-assisted merge conflict resolution
- →Work across branches in parallel with Git worktrees
- →GitHub Desktop 3.6 enhances Git workflows
- →Author commits with enhanced control and repository standards
Features (3) ›
- Copilot SDK powers new commit and conflict features
GitHub Copilot in Desktop now runs on the Copilot SDK, enabling enhanced commit message generation and AI-assisted merge conflict resolution. The SDK also allows users to select from available Copilot models, use bring-your-own-key (BYOK) with third-party providers, or connect locally running models.
- AI-assisted merge conflict resolution
GitHub Desktop can now help explain conflicting changes and suggest resolutions during merge conflicts. Users can review, accept, or edit these suggestions before completing the merge.
- Work across branches in parallel with Git worktrees
Support for Git worktrees allows users to work on multiple branches simultaneously without stashing changes, switching branches frequently, or creating extra repository clones. This feature is particularly useful for AI coding agents.
Enhancements (1) ›
- Author commits with enhanced control and repository standards
Commit message generation is more powerful, respecting custom instructions from .github/copilot-instructions.md and AGENTS.md files, and adhering to repository-defined commit metadata rules for style and standards.
Notes (2) ›
- GitHub Desktop 3.6 enhances Git workflows
GitHub Desktop 3.6 introduces deeper GitHub Copilot integration for commit authoring and merge conflict resolution, alongside Git worktree support to streamline day-to-day Git operations.
- Availability and access
GitHub Desktop 3.6.0 is available for macOS and Windows. Automatic updates are rolling out, or the latest release can be downloaded. Copilot-powered features require access to GitHub Copilot.
https://github.blog/changelog/2026-06-26-github-desktop-3-6-worktrees-and-deeper-copilot-integration