continue from the previous
- git checkout -b uppercase
- echo "HELLO" > greeting.txt
- git commit -am "Change greeting to uppercase"
- git checkout master // or main
- echo "Greetings library" > README.md
- git add README.md
- git commit -m "Add readme"
- Which branches exist?
- Look at the log for the master branch
- Check out the uppercase branch
- How does the log compare to the log on the master branch?
- Rebase your uppercase branch with the master (
git rebase master
) - What did just happen? Draw it!
- Now checkout the master branch
- Merge uppercase into master
- What does the log look like now?
git checkout <branch-name>
git rebase <branch-name>
git log --oneline --graph --all
git merge <branch-name>