dolt merge
Join two or more development histories together. More information: https://docs.dolthub.com/cli-reference/cli#dolt-merge.
- Incorporate changes from the named commits into the current branch:
dolt merge
- Incorporate changes from the named commits into the current branch without updating the commit history:
dolt merge --squash
- Merge a branch and create a merge commit even when the merge resolves as a fast-forward:
dolt merge --no-ff
- Merge a branch and create a merge commit with a specific commit message:
dolt merge --no-ff ""
- Abort the current conflict resolution process:
dolt merge --abort
来源:tldr-pages contributors · 作者与贡献记录 · CC BY 4.0。离线整理了版式、链接和媒体显示。
