2022-10-16 04:15:56 +01:00
|
|
|
# dolt merge
|
|
|
|
|
|
|
|
|
|
> Join two or more development histories together.
|
2023-11-19 21:07:13 +00:00
|
|
|
> More information: <https://docs.dolthub.com/cli-reference/cli#dolt-merge>.
|
2022-10-16 04:15:56 +01:00
|
|
|
|
|
|
|
|
- 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}}" {{branch_name}}`
|
|
|
|
|
|
|
|
|
|
- Abort the current conflict resolution process:
|
|
|
|
|
|
|
|
|
|
`dolt merge --abort`
|
