GitHub Desktop 3.6 Copilot Integration: Worktrees, Conflicts, and QA

Full Guide

Kingy verdict: GitHub Desktop 3.6 is a meaningful workflow release for developers who want parallel branches and reviewable Copilot assistance without living in a terminal. Worktrees, model choice, commit guidance and conflict suggestions address real friction. The release should still be evaluated as a Git client with AI-assisted steps, not as an autonomous merge system.

What changed in Desktop 3.6

GitHub’s June 26, 2026 release adds Git worktrees, deeper Copilot-powered commit authoring and AI-assisted merge-conflict resolution. Copilot features now use the Copilot SDK and expose a model picker. GitHub also describes bring-your-own-key support for a third-party provider or locally running model, subject to the provider and organization configuration available to the user.

Commit generation can read .github/copilot-instructions.md, AGENTS.md and repository commit-metadata rules. That is useful only if those files are reviewed and versioned. A generated message can still overstate a change, omit a breaking effect or leak information from an inappropriate instruction source.

Worktrees and conflict review

Desktop 3.6 can create and switch among linked worktrees so separate branches remain checked out at the same time. This fits agent workflows that operate in isolated branches, but worktrees share one Git repository. Hooks, ignored files, build caches, ports and local services can still collide. Teams should decide how an agent worktree is named, cleaned and audited.

For merge conflicts, Desktop can explain competing changes and suggest a resolution that the developer may review, accept or edit. The suggestion is not evidence that tests pass or both authors’ intent survived. Compare the proposed resolution with both sides, rerun relevant tests and preserve a manual path for complex generated files or semantic conflicts.

Failure modes to keep visible

A worktree can look isolated while still sharing repository configuration, hooks and object storage. A commit-message model can describe the intended task instead of the actual diff. A conflict assistant can produce syntactically valid code that drops a validation path, changes ordering or combines two incompatible assumptions. Keep the staged diff, test output and repository status visible at every acceptance step. For regulated repositories, retain the original conflict, the accepted resolution and the reviewer identity instead of storing only the final merge.

Pricing and availability

GitHub says Desktop 3.6.0 is available for macOS and Windows and that GitHub Desktop itself is free to download and use. Copilot-powered features require GitHub Copilot access. Plan charges, AI-credit use and provider costs depend on the selected Copilot plan, model and any bring-your-own-key configuration.

Do not describe the whole release as free merely because the desktop client is free. Separate the client, the Copilot entitlement, model consumption and any third-party provider bill. Organization policies may also restrict models or bring-your-own-key use.

How Kingy would evaluate it

Create three worktrees from the same repository and assign one bounded task to each. Measure branch isolation, file-watcher and port conflicts, instruction loading, commit-message accuracy and cleanup. Introduce text, rename/delete and generated-file conflicts, then compare Copilot’s explanation and proposed resolution with a manual merge.

Repeat with two available models and, where policy permits, one external provider. Record latency, credits, false confidence, reviewer edits and whether repository protections still apply. Kingy reviewed GitHub’s release article, Desktop documentation, download surface, public repository and Copilot pricing reference; we did not install version 3.6 or reproduce its workflows.

Primary sources

• GitHub Desktop 3.6 release article
• GitHub Desktop documentation
• Official GitHub Desktop download
• GitHub Desktop public repository
• GitHub Copilot models and pricing reference