Branch often, Commit often!
HEAD – most recent commit of currrent branch
- when you merge, you merge INTO the current branch
- go to the branch(checkout)
- merge into the branch
commit – its cheap, saves only some basic info, does not save whole files. after a commit, you form a link to its parent.
git branch <branch name> – creates a branch
git checkout <branch name> – checks out a branch, changes which branch you are on
git merge <branch name> – merges branch with name <branch name> onto current branch