Skip to content
DOCS

Sync, GitHub and merge conflicts

Push and pull with one button, publish a project to GitHub, and resolve merge conflicts in the editor.

These need Git mode.

SyncLink to this section

The top of the Git tab has one button that does what's needed next: Publish branch, Pull N new commits, Push N commits or Check for new commits. Studio also checks the remote every 5 minutes (turn it off in Settings, Versions & Git).

Before and after a pull, merge or rebase, Studio saves a version of your files. Pushes are never forced.

If git needs you to sign in, Studio asks in a window; it never stores what you type.

GitHubLink to this section

Sign in under Settings, Account, Connected Accounts. If you use the GitHub CLI, Studio offers to continue as that account.

With no remote yet, click Publish to GitHub in the Git tab: pick the owner and name, Private (the default) or Public, and Publish. Studio pushes your current branch; its versions and chats stay on your computer.

Merge conflictsLink to this section

When a merge or pull conflicts, the Git tab shows each conflicted file.

  • In the editor, each conflict has Keep buttons for each side, named by branch, and Keep Both. Save the file to resolve it.
  • In the Git tab, Keep a whole file's side, or Resolve with Agent to have the agent resolve the marked conflicts.
  • Finish Merge commits once everything is resolved. Abort Merge stops it (a version is saved first).