Merging Workspaces

How to bring completed workspace changes back into your main branch.

Merge a workspace after its changes are committed, reviewed, and ready to land. Treq keeps each workspace on its own branch, so merging is the point where that isolated work becomes part of your main repository history.

Before You Merge

Open the workspace and confirm there are no unexpected uncommitted changes. Commit anything that should be included, then run the relevant tests from the workspace terminal.

If the branch is shared with a remote, push it before review or merge so collaborators can see the same commits.

Merging From Treq

From the dashboard, select the workspace and choose Merge. Treq shows the target branch, the commits that will be merged, and any warnings about uncommitted changes or branch divergence.

Review the summary carefully, then confirm the merge. After the merge completes, Treq updates the dashboard so the workspace no longer shows commits ahead of the target branch.

Handling Conflicts

Treq only opens the merge preview once the workspace has no conflicts against the target branch. If conflicts exist, resolve them in the workspace first: open the affected files, resolve the conflict markers, and commit the resolution.

For large conflicts, pause and make sure the target branch is up to date before continuing. Pull the latest main branch, resolve conflicts in the workspace, and retry once tests pass. The merge preview becomes available as soon as the workspace is conflict-free.

After Merging

Treq deletes the workspace automatically once the merge completes. Push the target branch if the merge should be shared with a remote.