git basics
DESCRIPTION
Basic ideas behind gitTRANSCRIPT
![Page 1: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/1.jpg)
git
![Page 2: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/2.jpg)
История директории локально
Снэпшот — commit
Процесс создания снэпшота — тоже commit
![Page 3: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/3.jpg)
commit
add → commit
ignore
![Page 4: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/4.jpg)
Immutable history — DAG
Ничего не теряется!
![Page 5: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/5.jpg)
Blob & sha1
![Page 6: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/6.jpg)
Branch Branch pointer
checkoutcommitHEAD
master
fix-bug-1234
feature1
![Page 7: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/7.jpg)
github.com
Social coding
Fork me!
Pull request — модель авторизации наоборот
![Page 8: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/8.jpg)
remotes
master
remote/origin/master
master
cloneremote add
![Page 9: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/9.jpg)
fetch
master
remote/origin/master
master
![Page 10: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/10.jpg)
merge
remote/origin/master
master
master
![Page 11: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/11.jpg)
merge conflicts
the number of planets are
<<<<<<< HEAD
nine
=======
eight
>>>>>>> branch-a
![Page 12: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/12.jpg)
merge conflicts
![Page 13: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/13.jpg)
rebase — альтернатива merge
1
master
remote/origin/master
master
1’
2
2’
diff1
diff2
diff1 diff2
![Page 14: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/14.jpg)
pull = fetch + mergepull --rebase = fetch + rebase
![Page 15: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/15.jpg)
push
1
master
remote/origin/master
master
1’
2
2’
1’ 2’
![Page 16: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/16.jpg)
push conflict
1
master
remote/origin/master
master
1’
2
2’
![Page 17: Git basics](https://reader034.vdocuments.net/reader034/viewer/2022052601/55945a7b1a28ab4c728b465e/html5/thumbnails/17.jpg)
Домашнее задание
https://www.codeschool.com/courses/try-git
http://pcottle.github.io/learnGitBranching/