TLDR Search

Enter a command. For example: phing, yacas, join, git diff files.

git merge

Merge branches. More information: https://git-scm.com/docs/git-merge.

• Merge a branch into your current branch:
   
  git merge {{branch_name}}
   
• Edit the merge message:
   
  git merge -e {{branch_name}}
   
• Merge a branch and create a merge commit:
   
  git merge --no-ff {{branch_name}}
   
• Abort a merge in case of conflicts:
   
  git merge --abort