dolt-merge
Join two or more development histories together. tldr-pages
On several platforms
Several platforms
Incorporate changes from the named commits into the current branch
dolt merge branch_nameIdentifyIncorporate changes from the named commits into the current branch without updating the commit history
dolt merge --squash branch_nameIdentifyMerge a branch and create a merge commit even when the merge resolves as a fast-forward
dolt merge --no-ff branch_nameIdentifyMerge a branch and create a merge commit with a specific commit message
dolt merge --no-ff --message "message" branch_nameIdentifyAbort the current conflict resolution process
dolt merge --abortIdentify