dolt-merge

Merge branch into current branch

$ dolt merge [branch_name]

$ dolt merge [branch_name] -m "[Merge message]"

$ dolt merge --abort

$ dolt merge --squash [branch_name]

dolt merge [options] branch

dolt merge joins development histories by incorporating changes from another branch into the current branch. It combines table modifications, resolving changes where possible.
When merge conflicts occur (same row modified differently in both branches), the merge pauses for manual resolution. Conflict markers identify problematic rows that need attention before completing the merge.
Squash merges combine all branch changes into a single commit, useful for maintaining clean history when feature branches have many small commits.

BRANCH

Branch to merge into current branch.

Commit message for merge.

Squash commits into single change.

Abort current merge operation.

Merge but don't auto-commit.

Display help information.

Conflicts require manual resolution. Large merges may be complex. Squash loses individual commit history. Cannot merge with uncommitted changes.

dolt merge implements git merge semantics for database tables, enabling collaborative workflows with branch-based development on versioned data.

dolt(1), dolt-checkout(1), git-merge(1)