How to merge worktree branch to main T3?

[mastoj]

How do I merge a branch if I created a session with a worktree? Will settle automatically merge it?

(I know how to do it by hand, just wondering if there is anything in T3 Code that will do it for me when I am done with the work in the worktree)

[msegec]

I’m still fairly new to this, so there may be a better way, but I usually open a new thread and ask the agent to merge the worktree branch when I’m finished.

A “Merge and start new session” option, or something similar, would be useful. I’m not sure whether automatically merging is considered good practice, but I’d use it.

[shurkanTwo]

Settle does not automatically merge the worktree branch. It marks the thread as finished and moves it out of the active list while keeping the conversation.

In v0.1.0, settling also closes idle thread terminals and can run project actions you explicitly configured to run on settlement. Those actions are separate from merging; see Settle finished work.

For a merge through T3's UI, the documented workflow is to use the thread's Git actions to commit, push, and create a PR, then open Pull requests to review and merge it: create a pull request / review and merge.

Automatic settlement after a PR merges works in the other direction: merge → settle. If you want a purely local merge without a PR, asking the agent to perform that Git operation before settling is an option.