Skip to content

Exercise #2. Git Branching and Merging∗

Description∗

Work with branches in the local repository.

References∗

Guidance∗

1. Initialize a repository∗

  • Create a new directory.
  • Initialize a new repository in the created directory.
Hint
mkdir ex02
cd ex02
git init

2. Create a project with an empty file readme.md∗

  • Create a project directory.
  • Add readme.md.
  • Commit all changes.
Hint
mkdir pro
cd pro
touch readme.md
git add .
git commit -m "repo: initial commit"

3. Create a new branch and modify readme.md∗

  • Create a new branch named first_branch and switch to it.
  • Modify the readme.md: add a list of console commands to solve the 1st subtask.
  • Display the state of the working directory and the staging area (list which files are staged, unstaged, and untracked).
  • Commit all changes.
Hint
git checkout -b first_branch
gedit readme.md 
git status
git commit -am "readme: add the command log of the 1st subtask"

4. Switch back to the master branch and modify readme.md∗

  • Switch back to the master branch.
  • Modify the readme.md: add a list of console commands to solve the 2nd subtask.
  • Commit all changes.
  • Display the project history.
Hint
git checkout master
gedit readme.md
git commit -am "readme: add command log to solve 2nd subtask"
git log --oneline --decorate --graph --all

5. Merge the first_branch back into your master branch∗

  • Show the working tree status.
  • Merge the changes made to the first_branch on top of master
  • Show the working tree status.
  • Display the project history.
  • Modify the readme.md: add a list of console commands to solve 3rd and 4th subtasks.
  • Commit all changes.
  • Display the project history.
Hint
git status
git merge first_branch 
git mergetool
git status
git log --oneline --decorate --graph --all
gedit readme.md
git commit -am "readme: add command log to solve 3rd and 4th subtasks"
git log --oneline --decorate --graph --all