Forrest logo
back to context overview

dolt-merge

List of commands for dolt-merge:

  • dolt-merge:tldr:475e5 dolt-merge: Incorporate changes from the named commits into the current branch.
    $ dolt merge ${branch_name}
    try on your machine
    explain this command
  • dolt-merge:tldr:a4e51 dolt-merge: Merge a branch and create a merge commit even when the merge resolves as a fast-forward.
    $ dolt merge --no-ff ${branch_name}
    try on your machine
    explain this command
  • dolt-merge:tldr:c5905 dolt-merge: Merge a branch and create a merge commit with a specific commit message.
    $ dolt merge --no-ff -m "${message}" ${branch_name}
    try on your machine
    explain this command
  • dolt-merge:tldr:cf104 dolt-merge: Incorporate changes from the named commits into the current branch without updating the commit history.
    $ dolt merge --squash ${branch_name}
    try on your machine
    explain this command
  • dolt-merge:tldr:d23ac dolt-merge: Abort the current conflict resolution process.
    $ dolt merge --abort
    try on your machine
    explain this command
back to context overview