diff --git a/snippets/merge-branch-merge-commit.md b/snippets/merge-branch-merge-commit.md new file mode 100644 index 000000000..d2ae0216e --- /dev/null +++ b/snippets/merge-branch-merge-commit.md @@ -0,0 +1,21 @@ +--- +title: Merge a branch and create a merge commit +tags: repository,branch,intermediate +--- + +Merges a branch into the current branch, creating a merge commit. + +- Use `git checkout ` to switch to the branch into which you want to merge. +- Use `git merge --no-ff -m ` to merge a branch into the current branch, creating a merge commit with the specified ``. + +```sh +git checkout +git merge --no-ff -m +``` + +```sh +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" +``` diff --git a/snippets/merge-branch.md b/snippets/merge-branch.md new file mode 100644 index 000000000..f870e5c9c --- /dev/null +++ b/snippets/merge-branch.md @@ -0,0 +1,19 @@ +--- +title: Merge a branch +tags: repository,branch,beginner +--- + +Merges a branch into the current branch. + +- Use `git checkout ` to switch to the branch into which you want to merge. +- Use `git merge ` to merge a branch into the current branch. + +```sh +git checkout +git merge +``` + +```sh +git checkout master +git merge patch-1 # Merges the `patch-1` branch into `master` +```