GitHub: Desktop 3.6 brings Git worktrees and AI merge conflict resolution
GitHub Desktop 3.6 is available for macOS and Windows, introducing support for Git worktrees — a mechanism that enables parallel work on multiple branches without stashing — along with deeper Copilot integrations for commit messages and merge conflicts.
This article was generated using artificial intelligence from primary sources.
Parallel branch work without compromise
GitHub Desktop 3.6 introduces support for Git worktrees — a mechanism that allows simultaneous work on multiple branches in separate directories without switching between them or stashing unfinished changes. Unlike the classic approach where a developer must temporarily set aside work on one branch to move to another, a worktree places each branch in its own working directory that shares the same .git repository. The result is faster context switching and lower risk of losing unfinished work.
Version 3.6 is available for macOS and Windows and is being rolled out progressively, meaning not all users will see the update on the same day.
How does Copilot integrate more deeply?
Copilot in Desktop 3.6 reads instructions from .github/copilot-instructions.md and — as a new addition — from the AGENTS.md file. AGENTS.md is a standardized file through which a repository describes itself and its rules for AI agents working with the code. The fact that Desktop now reads it signals the maturing ecosystem around agent-friendly repositories.
In addition, Copilot now offers AI-assisted merge conflict resolution directly in the interface. A conflict that previously required manual analysis of differences between two branches can now be analyzed by the agent, which proposes a resolution without leaving the application.
BYOK and the foundation for future features
Desktop 3.6 introduces a BYOK (Bring Your Own Key) option, which allows users to connect local or third-party models instead of relying exclusively on GitHub Copilot. GitHub notes that the Copilot SDK was chosen as the foundation for future features, signaling that AI integration in Desktop will grow iteratively rather than through one-off additions.
The combination of worktree support and deeper Copilot integration positions Desktop 3.6 as a relevant tool for development teams seeking a visual client with AI assistance in their daily workflow.
Frequently Asked Questions
- What is a Git worktree and what is it for?
- A Git worktree is a mechanism that allows simultaneous work on multiple branches in separate directories without stashing — each branch has its own working directory, but they share the same repository.
- How does Copilot now use the AGENTS.md file?
- When generating commit messages, Copilot reads instructions from the .github/copilot-instructions.md and AGENTS.md files in the repository, giving teams control over the tone and format of automated messages.