Merge a worktree into your project

Steps

  1. Select Merge into your project

    In a conversation working in the worktree, select Merge into followed by your project’s name, on the band at the top of the message box. Or, in the conversation list, open the three-dot menu on the worktree’s heading and choose Merge into your project.

    A conversation working in a worktree, with the colored band at the top of the message box. Highlighted: Merge into (your project's name).A conversation working in a worktree, with the colored band at the top of the message box. Highlighted: Merge into (your project's name).
  2. Read the agent’s reply

    Enjoy sends the message right away, with no window to confirm, such as “Merge the dark-mode worktree into the main folder.” The agent does the merge and tells you how it went.

Good to know

  • The message is a normal message in the conversation. If the agent is working, it reaches the agent the way anything you type then does. Select Stop first if you’d rather it stopped.
  • From the conversation list, the message goes to the conversation right under the worktree’s heading, which is the one most recently active there.
  • If both versions changed the same files, the agent works out how they fit together and asks you about anything it can’t decide.
  • The worktree stays after merging, so you can keep working in it. When you’re finished with it, delete it. See Delete a worktree.
  • Merging changes the files in your main folder, so every conversation there works with the merged files from then on.
  • The iPhone app has no merge button. Ask in a message instead: “Merge this worktree into the main folder.”

If something goes wrong

The agent stops before merging

The agent says why in its reply, such as changes in your main folder that aren’t committed. Reply with what you’d like it to do, such as “Commit those and carry on.”

“This conversation couldn’t load. Start a new conversation.”

Enjoy couldn’t send the message, because this conversation can’t take any. Start a new conversation and ask there.

See also

  1. 01Try ideas side by side in worktreesBranches & changes · 5 min
  2. 02Delete a worktreeBranches & changes · 2 min
  3. 03Save your changes with a commitBranches & changes · 2 min
  4. 04Undo changes an agent madeBranches & changes · 2 min

Did this help?

Service

If Enjoy doesn’t work as this manual describes, a person will help.