GitHub Desktop 3.6 Adds Git Worktree Support and Moves Copilot Into Commit Authoring and Merge-Conflict Resolution
GitHub Desktop 3.6.0, released June 26, brings a graphical worktree workflow and routes Copilot into commit messages and merge conflicts, with a model picker and BYOK.
Editor's Note ·
- Clarification:
- Provenance note: automated source snapshots for both cited URLs failed at review time (github.blog returned a fetch error and windowsforum.com returned HTTP 403 bot-block), so no local HTML snapshot is archived for this article. Every claim and direct quote was instead verified against the live sources; the URLs are valid, not dead links.
- Clarification:
- Sourcing note: the secondary source windowsforum.com is not on the newsroom's source allowlist. It is used only for corroboration (the June 26, 2026 release date, BYOK support, and the caution that an AI-suggested merge can still be wrong). All primary facts and every direct quote derive from GitHub's own changelog on github.blog.
Overview
GitHub has released version 3.6 of GitHub Desktop, its free graphical Git client, adding native Git worktree support and pushing GitHub Copilot deeper into everyday version-control tasks. According to the GitHub Changelog, the update “brings more of your day-to-day Git flow into one place with GitHub Copilot now powering commit authoring and merge conflict resolution, plus new Git worktree support.” The same changelog states that GitHub Desktop 3.6.0 is available for macOS and Windows. A separate write-up from Windows Forum independently dates the release to June 26, 2026.
What We Know
The headline addition is graphical support for Git worktrees, a Git feature that lets a single repository check out multiple branches into separate working directories at the same time. According to the GitHub Changelog, the client “now supports Git worktrees, so you can work across multiple branches at once without repeatedly stashing changes, switching branches, or cloning the same repository.” GitHub explicitly ties the feature to AI coding tools, noting it is “especially handy alongside coding agents, which often spin up worktrees to run isolated, parallel sessions,” per the changelog.
On the Copilot side, GitHub says the assistant now generates commit messages that follow a repository’s conventions. It “picks up custom instructions from your .github/copilot-instructions.md and AGENTS.md files, and honors commit metadata rules defined for your repository,” according to the changelog.
Copilot has also been wired into conflict handling. The changelog says merge conflicts “are now easier to navigate with AI-assisted resolution,” and that when a conflict arises, “Desktop can help explain the conflicting changes and suggest a resolution that you can review, accept, or edit before completing the merge.” GitHub notes that Copilot in the client “now runs on the Copilot SDK, the shared foundation behind both the enhanced commit message experience and the new merge conflict workflow,” per the changelog.
The release adds model choice across those features. “Every Copilot feature in GitHub Desktop now includes a model picker so you can choose from the models available to you through GitHub,” the changelog reads, adding that users “can also use bring your own key (BYOK) to connect a third-party provider or a model running locally on your machine.” Windows Forum similarly reports that users can bring their own key to connect a third-party provider or a model running locally.
The application itself remains free. The changelog states that “GitHub Desktop is free to download and use, and Copilot-powered features require access to GitHub Copilot.”
What We Don’t Know
GitHub’s changelog does not detail how the worktree interface handles edge cases such as shared submodules or Git LFS across multiple checkouts, nor does it publish benchmarks for the Copilot-assisted merge workflow. The company has not said whether the worktree feature or the Copilot-driven conflict resolution will change how it positions GitHub Desktop against its separate, newer standalone Copilot desktop application. The Windows Forum coverage cautions that an AI-suggested resolution should still be reviewed, noting that a clean merge can still be wrong.