Merging

Merging brings one branch's commits into another.

Pick the branch to merge from and the one to merge into. Only commits are merged: changes you have not committed stay where they are.

What can happen

• Up to date: the target already has everything.
• Fast-forward: the target has not changed since the branch was made, so it simply moves on to the branch's newest commit.
• A merge commit: both changed, in different records or different fields. The changes are combined.
• Conflicts: both changed the same field of the same record, or one changed a record the other deleted. The merge stops and shows each conflict; you choose which side wins, then finish. You can also abort, which leaves both branches as they were.

Who may merge

Merging into a branch is a change to it, so it is for whoever may change it: its editors, admins and owner. A branch can be switched to only its admins merge. On a protected branch, only the workspace's admins and owners merge.

You merge from a branch you read. A branch that is not given to you cannot be merged from, and a guest merges only between branches shared with them.

Asking for a merge

Somebody who changes a branch but may not merge it where it should go asks for it: Request merge in the branch menu.

You say what the branch changes, and everybody who may merge into the target gets an item in their Inbox. Opening it shows the branch's history, where they can look at the commits and merge.

The branch's changes must be committed first. The target is main unless you read no such branch: a guest who was not given main has nothing to ask for there, and merges into the branch that was shared with them. There is one request per pair of branches: asking again renews it.

Agents and workflows

An agent can merge only into a branch that is not protected. To get its work into main it asks for a merge like a member does. Workflows have their own branch functions: create a branch, commit, merge, close.