GitHub Desktop Makes Worktrees an AI Agent Control
GitHub Desktop 3.6 makes worktrees accessible beside Copilot-assisted commits and conflict resolution, turning branch isolation into an operating control for parallel AI work.
GitHub Desktop 3.6 brings worktrees and AI-assisted conflicts together. The operator lesson is isolation, review, and controlled parallelism.
The difficult part of running multiple coding agents is not generating more code.
It is keeping parallel work isolated, reviewable, and reversible.
GitHub Desktop 3.6 adds native worktree support alongside Copilot-assisted commit authoring and merge-conflict resolution. GitHub positions worktrees as a way to operate across branches without repeated stashing, branch switching, or extra repository clones. It is more important for teams introducing agents into delivery workflows.
A worktree gives each task a separate working directory attached to its own branch while sharing the same repository history. In an agent-heavy workflow, that is not merely convenience. It is an isolation boundary.
The Short Answer
Worktrees let teams run human or agent tasks in parallel without mixing uncommitted state. GitHub Desktop 3.6 makes that pattern easier to use, but the governance still depends on branch ownership, tests, review, and explicit merge authority.
The release does not make parallel AI development safe by itself. It makes a safer operating model accessible to more teams.
Parallelism Creates A State Problem
One coding agent can change files quickly. Three agents can change the same files quickly.
Without isolation, each task sees a moving filesystem. One agent may format a file while another changes its logic. A third may test a mixture of both. The shared state makes the result hard to attribute and reverse.
Traditional branch switching reduces that risk only when the working tree is clean. In practice, people stash changes, reuse local artifacts, or delay switching because another task is half-finished.
Worktrees change the unit of execution. Each agent receives a branch and a directory. Its edits, build output, test failures, and eventual diff stay attached to that task. The main working copy remains stable.
That is the same principle behind reliable financial infrastructure: isolate state changes, retain an audit trail, and make promotion explicit.
Isolation Is Not Approval
GitHub Desktop 3.6 also introduces Copilot-assisted conflict resolution. The application can explain competing changes and propose a resolution for the user to review, accept, or edit. GitHub's documentation is clear that conflicts still require resolution before merge.
An agent can propose a conflict resolution. It should not decide which business rule wins. Two branches may pass local tests while expressing incompatible assumptions about authorization, ledger state, limits, or customer eligibility.
The control is not “AI resolved the conflict.” The control is “the proposed resolution is visible, attributable, tested, and approved by the correct owner.”
Teams that already struggle with vendor and delivery governance should not expect a model picker to repair unclear ownership. Agent output magnifies the need for decision rights.
The New Commit Surface Needs Policy
GitHub says Copilot-powered commit authoring in Desktop 3.6 can read repository instructions from .github/copilot-instructions.md and AGENTS.md, and can honor repository commit metadata rules. That is a meaningful shift from generic generated commit messages toward repository-specific behaviour.
It also creates a policy surface.
Instructions should state what an agent can change, which tests are mandatory, what evidence belongs in the pull request, which directories require specialist review, and what must never be committed. A vague “follow best practices” file is not governance. It is decoration.
For a fintech repository, useful rules may include:
- never modify migrations and application logic in one unreviewed task;
- require ledger invariants and idempotency tests for money movement;
- block production secrets and customer data from prompts, logs, and commits;
- require explicit approval for pricing, limits, risk, or compliance behaviour;
- attach test output and rollback notes to every agent-authored pull request.
The model can draft the commit. Repository policy must define what makes it admissible.
Model Choice Does Not Replace Task Design
Desktop 3.6 moves its Copilot features onto the Copilot SDK and exposes a model picker. GitHub also supports bring-your-own-key connections to compatible hosted or local models.
That flexibility is useful for latency, cost, privacy, and capability choices. It does not remove the need to route work deliberately. A fast model may suit commit summaries; a more capable model may be justified for a complicated conflict. Some repositories should use a local endpoint for sensitive context.
The operating principle from model routing in Copilot still holds: choose the model after defining the task, risk, evidence requirement, and failure cost.
Do not ask “which model should every developer use?” Ask “which classes of work may use which models under which controls?”
A Practical Agent Worktree Protocol
I would use five controls before scaling parallel agent work.
First, give every task a unique branch, worktree, owner, and bounded objective. An agent should not receive a broad instruction to improve the repository while other work is active.
Second, start from a known commit and record it. That makes later drift visible and helps explain why a conflict appeared.
Third, require task-local verification. Unit tests, type checks, linters, security checks, and targeted integration tests should run inside the worktree before a pull request is opened.
Fourth, separate conflict proposal from merge authority. An agent may explain or suggest a resolution. The relevant code owner approves the semantic decision.
Fifth, measure outcomes, not generated volume. Track accepted changes, review rework, escaped defects, rollback rate, cycle time, and conflict frequency. More agent-created lines are not evidence of better delivery.
This is where RAID and SteerCo discipline becomes relevant to AI engineering. The risks, assumptions, issues, dependencies, and decisions have not disappeared. They have moved closer to the code.
If your team is defining controls for parallel AI delivery in a regulated product, contact Rizwan to design the workflow around evidence, ownership, and production risk.
What A Fintech Leader Should Try Next
Choose one low-risk repository and run two independent tasks in separate worktrees. Require the same test suite and review template. Create one overlapping change to observe how the team handles conflict explanation and approval.
Measure the full task: time to merge, reviewer effort, failed checks, conflict resolution time, and post-merge defects.
If parallelism improves cycle time without increasing review burden or production risk, expand gradually. If reviewers become the bottleneck, adding more agents will only create a larger queue of uncertain diffs.
Actionable Takeaway
GitHub Desktop 3.6 lowers the adoption barrier for worktrees, Copilot-assisted commits, and conflict handling. The strategic value is not a faster Git interface. It is a clearer control model for parallel work.
Use worktrees to isolate execution. Use repository instructions to constrain behaviour. Use tests to produce evidence. Keep semantic merge authority with accountable humans.
The operator question: when five agents finish at once, does your team receive five reviewable changes or one shared-state incident?
FAQ
What is a Git worktree?
A Git worktree is an additional working directory linked to the same repository. It lets a separate branch be checked out without disturbing the main working directory.
Why are worktrees useful for AI coding agents?
They isolate each agent's files, build output, and uncommitted state, making parallel tasks easier to attribute, test, review, and reverse.
Can GitHub Copilot resolve merge conflicts automatically?
GitHub Desktop can explain conflicts and suggest resolutions for review. Teams should still test the result and keep approval with the owner accountable for the affected behaviour.

Chief Product Officer · Payments, Fintech & AI
Payments product & program leader — scaled a regulated multi-rail platform from $0 to $1B+ GTV across five frontier markets. These essays are the public version of how I think through the work.
This writing is the public version of how I think through product, programme and payment-infrastructure decisions in regulated markets.
Contact RizwanRizwan Zafar — Chief Product Officer · Payments, Fintech & AI.
One operator email a week. No filler.
Payment acceptance, settlement and product delivery notes from running $1B+ annual GTV across frontier markets — written for founders and payment leaders.
Weekly at most. Unsubscribe with one reply.
Essays in the same operating context.
GitHub Copilot app support for BYOK is more than another model picker. It is a signal that agent adoption will be governed through routing, policy, cost, and data boundaries.
Read essay →Most AI/ML projects in payments fail in production for reasons that have nothing to do with model accuracy. They fail because the team optimised for a leaderboard metric, the operating environment moved, the labels were wrong, or the audit cycle the model now lives inside was not part of the design. Seven patterns I see every year.
Read essay →Vendor governance is not procurement hygiene. In fintech programs, vendors often own critical path risk, certification evidence, uptime, support and launch readiness.
Read essay →