dolt merge

all

Join two or more development histories together.

Options (1)

-m, --messageboolean

Merge a branch and create a merge commit with a specific commit message

Example: dolt merge --no-ff {{[-m|--message]}} "{{message}}" {{branch_name}}

Incorporate changes from the named commits into the current branch

dolt merge branch_name

Incorporate changes from the named commits into the current branch without updating the commit history

dolt merge --squash branch_name

Merge a branch and create a merge commit even when the merge resolves as a fast-forward

dolt merge --no-ff branch_name

Merge a branch and create a merge commit with a specific commit message

dolt merge --no-ff [-m|--message] "message" branch_name

Abort the current conflict resolution process

dolt merge --abort