Branches and Merging

Your project’s work lives on branches. One of them, usually main, is your live site’s branch: changing it changes what’s live. If your project deploys automatically from git, production updates right away; otherwise main is what your next Publish ships.

Everything else is safe to try: other branches never touch your live site until you merge them into main.

Ask the agent

The AI agent can manage git for you. Ask in plain words:

• “What changed since yesterday?” or “Show me the history.”
• “Start a branch for the new pricing page.”
• “Compare my branch with main.”
• “Merge my branch into main.”

Creating branches, committing and comparing happen straight away. Anything that changes main asks you first: a card appears in the chat, marked Live site, saying exactly what will change. The agent waits for your answer — Approve — update live site or Decline — and a declined request changes nothing. A request you don’t answer expires after 15 minutes, and stopping the reply cancels it.

When changes conflict

If your branch and main both changed the same lines, the merge can’t happen on its own. The agent never resolves conflicts on main. Instead it merges main into your branch, fixes the conflicting files there, checks the result, and then asks you again to merge the branch into main — which is now clean.

Cloud agents

A cloud agent works on its own branch in the cloud. When its work is done it puts a Merge into main card in the chat; the agent itself can’t merge. Click Merge — update live site when you’re happy. The card then shows what happened:

• Merged into main — your live site’s branch now has the work.
• Conflicts — the card lists the files. Ask the agent to bring in the latest main and resolve them, then merge again from the same card.

The Git panel

Open the branch name in the title bar and choose Plyed.

The line at the top says which branch your project is on and what Publish will do from it: on your live branch it publishes live, on any other branch it publishes a preview.

• Create & switch makes a new branch and moves your project onto it. Your unsaved edits come along, and Plyed keeps a hidden safety copy of them first. Names starting with cloud/ or run- are reserved for cloud agents.
• Local lists the branches on your Mac. Click one to switch to it.
• On Plyed lists the branches synced to Plyed. A branch that is also on your Mac is marked local and just switches; one that isn’t has Check out, which brings it onto your Mac.
• If switching would overwrite changes you haven’t saved, nothing moves and the panel names the files. Sync first to save them on the branch you’re on, then switch. Switching is also paused while the AI agent is writing to your project, or while a merge is half-finished in a terminal.
• Sync saves your work and uploads it to the branch you’re on — the button names the branch. Pull updates that same branch from Plyed — for example after a cloud agent’s work was merged into main. Your own changes are saved first. If they conflict, nothing changes and the panel names the files.
• Cloud lists your cloud agents’ branches. Compare shows the files merging would change; Merge into main asks you to confirm — it changes your live site — and, if your project is on main, pulls the result in straight away. If you’re on another branch, the message offers Switch to main and pull so you can get the result in one click.
• Cloud chats start from your live branch. If your project is on another branch, switch to main first (or start the chat from the web on that branch).