Git-Workshop

02-Merge

1 min read

  1. Make sure that you are in the main branch
  2. Update the readme.md like below
# contents

- classics.md: The classic show titles in the GitFlix collection
- quotes: A directory of files containing memorable quotes from shows.
  1. Stage and commit the changes with D:

You can use this command to visualize the branches

git --no-pager log --oneline --graph --all

  1. Merge the changes from the add_classics branch into the main branch. You will be presented with a code editor to change the commit message. Update the message to start with E:
  2. Save the file, and close the editor.
  3. From the main branch visualize the branches.
git log --oneline --decorate --graph --parents
  1. Delete the add_classics branch
git branch -d add_classics