# git merge > Merge branches. - Merge a branch with 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 merge: `git merge --abort`