lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-04-23 22:42:08 +02:00
Code Activity
tldr/pages/common/dolt-merge.md
Juri Dispan 0f0c9da99e
*: replace dead more information links (#11542) 
* *: replace dead more informtion links

* dolt

* Apply suggestions from code review

Co-authored-by: K.B.Dharun Krishna <kbdharunkrishna@gmail.com>

---------

Co-authored-by: K.B.Dharun Krishna <kbdharunkrishna@gmail.com>
2023-11-19 22:07:13 +01:00

722 B
Raw Blame History

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 {{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