Merge a Branch and Create a Merge Commit
As a developer, you may need to merge a branch into the current branch, creating a merge commit. This can be a bit tricky if you're not familiar with Git. The problem is to merge a branch into the current branch, creating a merge commit, using the Git repository named https://github.com/labex-labs/git-playground
directory.
Tasks
For this challenge, let's use the repository from https://github.com/labex-labs/git-playground
.
- Clone the repository, navigate to the directory and configure the identity.
- Create and switch to a branch called
feature-branch
.
- Add "This is a new line." to the
README.md
file, add it to the staging area and commit it, the commit message is "Add new line to README.md".
- Switch to the
master
branch.
- Merge the
feature-branch
into the master
branch,which will create a merge commit with the message "Merge feature-branch".
This is the result of running git log
:
commit 45b7e0fa8656d0aa751c7ca3cee29422e3d6cf05 (HEAD -> master)
Merge: d22f46b 1f19499
Author: xiaoshengyunan <@users.noreply.github.com>
Date: Fri Jul 21 19:26:57 2023 +0800
Merge feature-branch
commit 1f1949955387a154ff1bb5286d3d0a2b993f87e0 (feature-branch)
Author: xiaoshengyunan <@users.noreply.github.com>
Date: Fri Jul 21 19:26:57 2023 +0800
Add new line to README.md