Git Branches

Ha Khanh Nguyen (hknguyen)

1. How Does Git Store Data?

2. What is a Branch?

2.0 Repostiory history

git log

2.1 Creating a new branch

git branch testing

2.2 The HEAD pointer

git checkout -b ha_branch

2.3 Switching Branches

git checkout testing

git checkout master

3. Branch Merging

git checkout master
git merge hotfix

git branch -d hotfix

3.1 Basic merging

git checkout master
git merge iss53

3.2 Merge conflicts

This lecture notes referenced materials in 3.1, 3.2 sections of Pro Git by Scott Chacon and Ben Straub.