- Run
source setup.sh
(or.\setup.ps1
in PowerShell)
You again live in your own branch, this time we will be doing a bit of juggling with branches, to show how lightweight branches are in git.
- 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>