From 5c815649fa68214c98fec736a76a03e7d22fcda1 Mon Sep 17 00:00:00 2001 From: Torfab Date: Sun, 16 Oct 2022 05:15:56 +0200 Subject: [PATCH] dolt-merge: add page (#8800) --- pages/common/dolt-merge.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pages/common/dolt-merge.md diff --git a/pages/common/dolt-merge.md b/pages/common/dolt-merge.md new file mode 100644 index 0000000000..4b74967453 --- /dev/null +++ b/pages/common/dolt-merge.md @@ -0,0 +1,24 @@ +# dolt merge + +> Join two or more development histories together. +> More information: . + +- 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`