understanding and practicing git
DESCRIPTION
HPDS lab tutorial on Git Date: 6/18 (Wed.) Author: Tzu-Li TaiTRANSCRIPT
![Page 1: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/1.jpg)
Understanding and PracticingUnderstanding and Practicing
GitGit
Tzu-Li TaiHPDS LaboratoryDept. of Electrical EngineeringNational Cheng Kung UniversityTainan, Taiwan
![Page 2: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/2.jpg)
Why do I need to learn Git?
2
242
![Page 3: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/3.jpg)
Why do I need to learn Git?
342
![Page 4: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/4.jpg)
What is Git?
Git - Version Control System (VCS)
● Concurrent Versions System (CVS)
● Apache Subversion (SVN)
442
![Page 5: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/5.jpg)
What will be taught today?
Understand the basics of Git … and some HANDS-ON practice
542
![Page 6: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/6.jpg)
What will be taught today?
Understand how to code with others using Git... and the Cloud
… and a little moreHANDS-ON practice for that
642
![Page 7: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/7.jpg)
Git Basics: Commit, Checkout, Merge
Commit
git commit7
42
![Page 8: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/8.jpg)
code_A.py
code_B.py
Git Basics: Commit, Checkout, Merge
842
![Page 9: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/9.jpg)
code_A*.py
code_B.py
A*.py
Git Basics: Commit, Checkout, Merge
Buffer everything before you actually make the change!
git add code_a.pygit commit
942
![Page 10: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/10.jpg)
Project History:A series of commits
Git Basics: Commit, Checkout, Merge
1042
![Page 11: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/11.jpg)
master
feature
Git Basics: Commit, Checkout, Merge
git branch featuregit checkout feature or
git checkout -b feature
1142
![Page 12: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/12.jpg)
master
feature
Git Basics: Commit, Checkout, Merge
git add XXXgit commit
1242
![Page 13: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/13.jpg)
master
feature
Git Basics: Commit, Checkout, Merge
git add XXXgit commit
1342
![Page 14: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/14.jpg)
master
feature
Git Basics: Commit, Checkout, Merge
git add XXXgit commit
1442
![Page 15: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/15.jpg)
master
bug-fix
feature
Git Basics: Commit, Checkout, Merge
git checkout mastergit checkout -b bug-fix
1542
![Page 16: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/16.jpg)
master
bug-fix
feature
Git Basics: Commit, Checkout, Merge
git add XXXgit commit
1642
![Page 17: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/17.jpg)
master
bug-fix
feature
Git Basics: Commit, Checkout, Merge
git checkout master
1742
![Page 18: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/18.jpg)
master
bug-fix
feature
Git Basics: Commit, Checkout, Merge
git checkout mastergit merge bug-fix
1842
![Page 19: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/19.jpg)
master
bug-fix
feature
Git Basics: Commit, Checkout, Merge
git checkout mastergit merge bug-fixgit branch -d bug-fix 19
42
![Page 20: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/20.jpg)
master
feature
Git Basics: Commit, Checkout, Merge
git checkout featuregit merge bug-fix
2042
![Page 21: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/21.jpg)
master
feature
Git Basics: Commit, Checkout, Merge
git add XXXgit commit
2142
![Page 22: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/22.jpg)
master
feature
Git Basics: Commit, Checkout, Merge
git checkout master
2242
![Page 23: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/23.jpg)
master
feature
Git Basics: Commit, Checkout, Merge
git checkout mastergit merge feature
2342
![Page 24: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/24.jpg)
Git Basics: Commit, Checkout, Merge
Time to get your hands dirty...
HANDS-ON PRACTICE24
42
![Page 25: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/25.jpg)
Git with Others using GitHub
Central Repository
Local Repositories25
42
![Page 26: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/26.jpg)
Git with Others using GitHub
init a central repo
… and clonea local repo
2642
![Page 27: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/27.jpg)
Git with Others using GitHub
master
branch-1
branch-2
origin/master
origin/branch-1
origin/branch-2
master
git clone XXX.git
2742
![Page 28: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/28.jpg)
Git with Others using GitHub
master
branch-1
branch-2
origin/master
origin/branch-1
origin/branch-2
master
branch-2
git checkout origin/branch-2git checkout -d branch-2
2842
![Page 29: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/29.jpg)
Git with Others using GitHub
master
branch-1
branch-2
origin/master
origin/branch-1
origin/branch-2
master branch-2
git add XXXgit commit
2942
![Page 30: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/30.jpg)
Git with Others using GitHub
master
branch-1
branch-2
origin/master
origin/branch-1
master
branch-2
origin/branch-2
git checkout origin/branch-2git merge branch-2
3042
![Page 31: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/31.jpg)
Git with Others using GitHub
master
branch-1
origin/master
origin/branch-1
master
branch-2
origin/branch-2
branch-2
git push
3142
![Page 32: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/32.jpg)
Git with Others using GitHub
master
branch-1
origin/master
origin/branch-1
origin/branch-2
master branch-2
branch-2
3242
![Page 33: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/33.jpg)
Git with Others using GitHub
master
branch-1
origin/master
origin/branch-1
origin/branch-2
master branch-2
branch-2
git fetch
3342
![Page 34: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/34.jpg)
master
feature
Git with Others using GitHub
3442
![Page 35: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/35.jpg)
master
feature
Git with Others using GitHub
3542
![Page 36: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/36.jpg)
master
feature
Git Basics: Commit, Checkout, Merge
… …
3642
![Page 37: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/37.jpg)
master
feature
Git Basics: Commit, Checkout, Merge
… …
git rebase master
3742
![Page 38: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/38.jpg)
Git with Others using GitHub
master
branch-1
origin/master
origin/branch-1
origin/branch-2
master branch-2
branch-2
3842
![Page 39: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/39.jpg)
Git with Others using GitHub
master
branch-1
origin/master
origin/branch-1
origin/branch-2
master branch-2
branch-2
git rebase origin/branch-2
3942
![Page 40: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/40.jpg)
Git with Others using GitHub
master
branch-1
origin/master
origin/branch-1
master
branch-2
branch-2
origin/branch-2
git checkout origin/branch-2git merge branch-2
4042
![Page 41: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/41.jpg)
Git with Others using GitHub
master
branch-1
origin/master
origin/branch-1
master
branch-2
origin/branch-2
branch-2
git push
4142
![Page 42: Understanding and Practicing Git](https://reader034.vdocument.in/reader034/viewer/2022051512/53fde8998d7f72a81c8b4bc1/html5/thumbnails/42.jpg)
Time to get your hands dirty again...
HANDS-ON PRACTICE
Git with Others using GitHub
4242