| Task | Command(s) |
|---|---|
| Merge another branch into the current branch | git merge otherBranchName |
| Merge, but disable Fast Forward Merging (preserve branching info) | git merge otherBranchName --no-ff |
| Automatic merge, creating a new branch commit | git merge otherBranchName -m "new merge commit message" |