git vol 2
DESCRIPTION
A follow up presentation on git with some common problems and a detailed walk through the git workflow.TRANSCRIPT
![Page 1: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/1.jpg)
![Page 2: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/2.jpg)
•
•
•
![Page 3: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/3.jpg)
![Page 4: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/4.jpg)
![Page 5: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/5.jpg)
git branch task1
![Page 6: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/6.jpg)
git checkout task1
![Page 7: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/7.jpg)
file
...
![Page 8: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/8.jpg)
file
...
git add file
![Page 9: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/9.jpg)
git commit
![Page 10: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/10.jpg)
git add
git commit
![Page 11: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/11.jpg)
git checkout master
git merge task1
![Page 12: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/12.jpg)
![Page 13: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/13.jpg)
![Page 14: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/14.jpg)
git fetch origin
![Page 15: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/15.jpg)
git push origin master
![Page 16: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/16.jpg)
![Page 17: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/17.jpg)
![Page 18: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/18.jpg)
git fetch
![Page 19: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/19.jpg)
git merge origin/master
![Page 20: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/20.jpg)
git push origin master
![Page 21: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/21.jpg)
![Page 22: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/22.jpg)
![Page 23: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/23.jpg)
git push origin task1
![Page 24: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/24.jpg)
git fetch origin
![Page 25: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/25.jpg)
git checkout –t origin/task1
![Page 26: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/26.jpg)
![Page 27: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/27.jpg)
•
•
•
<<<<<<< HEAD
some code
=======
some other code
>>>>>>> change-branch
git merge –s ours
![Page 28: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/28.jpg)
•
•
•
•
![Page 29: Git vol 2](https://reader033.vdocuments.us/reader033/viewer/2022052900/555c113bd8b42ad77e8b4e6b/html5/thumbnails/29.jpg)