Merges a branch into the current branch, creating a merge commit.
Use
git checkout <target-branch>
to switch to the branch into which you want to merge.Use
git merge --no-ff -m <message> <source-branch>
to merge a branch into the current branch, creating a merge commit with the specified<message>
.
git checkout <target-branch>
git merge --no-ff -m <message> <source-branch>
git checkout master
git merge --no-ff -m "Merge patch-1" patch-1
# Merges the `patch-1` branch into `master` and creates a commit
# with the message "Merge patch-1"