Use GitHub Desktop 3.6 to keep agent branches out of each other's way

GitHub Desktop 3.6 is available now for macOS and Windows. Confidence level: confirmed. The release adds Git worktrees, Copilot-assisted merge conflict resolution, repository-aware commit message generation, a Copilot model picker, and bring-your-own-key support for third-party or local models.

What changed

GitHub says Desktop 3.6 brings more day-to-day Git workflow into the app instead of pushing developers back to a terminal or a second clone. The main platform change is native Git worktree support, which lets users keep multiple working directories for the same repository and work across branches without repeated stashing or branch switching.

Copilot also moves deeper into the desktop workflow. GitHub says Copilot in Desktop now runs on the Copilot SDK, powers both commit authoring and merge conflict assistance, can use available GitHub Copilot models, and can connect through BYOK to third-party providers or a local model.

Key takeaways

• GitHub Desktop 3.6.0 is available now for macOS and Windows.
• Worktree support helps developers and coding agents keep parallel branch work isolated without cloning the same repository repeatedly.
• Copilot commit message generation can read .github/copilot-instructions.md, AGENTS.md, and repository commit metadata rules.
• Copilot can explain merge conflicts and suggest resolutions that the developer reviews, accepts, or edits.
• Copilot-powered Desktop features require GitHub Copilot access; GitHub Desktop itself remains free.

Availability and access

GitHub says automatic updates are rolling out progressively, and users can also download the latest release from the GitHub Desktop app page. The worktree feature is part of GitHub Desktop 3.6.0, while Copilot-powered commit authoring, model choice, BYOK, and conflict assistance require access to GitHub Copilot and the models available to that account.

The GitHub release page corroborates the 3.6 worktree and Copilot items, including worktree support, Copilot merge conflict resolution, cancellation for an in-progress Copilot commit-message request, and follow-up fixes for conflict-dialog behavior.

Practical LinkLoot angle

The useful shift is workflow containment. Agent-heavy teams already use worktrees so parallel tasks do not trample the same checkout. Bringing that into GitHub Desktop gives less terminal-heavy teams a visible way to separate "review this PR," "try this agent branch," and "keep my main work untouched."

Start with one low-risk repository. Create a worktree for an agent or experimental branch, let Copilot draft the commit message from the actual diff, and test a small merge conflict before treating the workflow as production-ready. For larger agent setups, pair this with LinkLoot's AI agent tools guide.

What to verify before you act

• Confirm every developer is actually on GitHub Desktop 3.6.0 or later.
• Check whether your organization allows Copilot, BYOK providers, and local model routing in Desktop.
• Put AGENTS.md and .github/copilot-instructions.md under review so generated commit messages do not inherit stale rules.
• Test Copilot conflict suggestions on a disposable branch before using them on production-critical merges.
• Define a cleanup rule for stale worktrees, especially when coding agents create many short-lived branches.

Source check

Confirmed by:

• GitHub's changelog confirms GitHub Desktop 3.6, worktree support, Copilot SDK usage, model picker, BYOK, repo-aware commit messages, AI-assisted merge conflict resolution, macOS and Windows availability, and Copilot access requirements.
• The GitHub Desktop releases page confirms the 3.6 release line includes worktree support, Copilot conflict resolution, Copilot commit-message cancellation, and related stability fixes.

Context:

• This post treats the release as a developer workflow update, not as a claim that Copilot can safely resolve conflicts without review. Merge behavior, repository rules, and model availability should be verified in each organization.