TLDR
Enter a command. For example: git ls remote, git archive.

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

This is a tldr pages (source, CC BY 4.0) web wrapper for cheat-sheets.org. All commands, popular commands, most used linux commands. Referrals. Progressive Web Application (PWA) version to install on your device.