GitHub Desktop 3.6 brings Copilot commit writing and conflict resolution into the desktop app

What changed

GitHub announced GitHub Desktop 3.6 in its changelog on June 26. This version has two major pillars. One is Git worktree support, which lets users handle the same repository across multiple working directories. The other is a flow where GitHub Copilot helps with commit authoring and merge conflict resolution.

GitHub Desktop is a Git app often used by developers who are more comfortable with visual controls than terminal commands. That makes this update more practical than the idea that “AI writes code for you.” It means Copilot is being attached to repeated development tasks such as branch organization, commit messages, and conflict resolution.

Why worktrees matter

A worktree is a feature that lets one repository have multiple working directories at the same time. For example, one directory can be used to build a new feature while another opens an urgent bug-fix branch. The feature is already familiar to people used to terminal Git, but adding it to a desktop app lowers the barrier to entry.

The release notes also explain that GitHub added a feature for managing multiple working directories for the same repository. From a beginner’s point of view, this can reduce the risk of work getting mixed up while frequently switching branches. For teams, it can also make a development flow that keeps several contexts open at once easier to manage.

Where Copilot is being added

According to GitHub, Desktop 3.6 lets Copilot support commit authoring and merge conflict resolution. The release notes also include an item about resolving merge conflicts with Copilot, as well as an item that lets users stop requests where Copilot is generating a commit message.

This means Copilot is no longer only a tool that answers inside a code editor. It is moving into the decision points of Git work. Writing a commit message is the work of summarizing “what I just changed,” while resolving a merge conflict is the work of deciding “how to combine changes made by two people.” Both require context more than simple autocomplete.

What it means for general readers and developers

For developers, Git is similar to managing save files in a game. It saves work at a certain point, lets you experiment on a separate branch, and helps merge teammates’ changes. For beginners, however, commands and conflict messages can feel difficult.

The direction of GitHub Desktop 3.6 is to reduce that burden. It creates a structure where users can visually manage work branches, get help describing commits, and find the first clue for resolving conflicts. Especially for people getting started with vibe coding or AI-assisted development, it can be read as a sign that AI is beginning to support the organize-save-merge stage that comes after writing code.

What still needs caution

That said, Copilot helping with conflict resolution does not mean users should trust the result as-is. Merge conflicts can change how a real service behaves, so the suggested result still needs to be checked and tested. Copilot features may also appear differently depending on the account plan, organization policy, and app version.

This news does not mean “GitHub Desktop now automatically solves every development problem.” More precisely, it marks a change where AI development tools are expanding beyond the code-writing screen into Git management screens. For Game Sunakku readers, it is better understood as a practical shift in how work gets done than as another new model benchmark.