Transcript
![Page 1: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/1.jpg)
LECTURE 14OCT 22 , 2010
Git, in graphic form
![Page 2: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/2.jpg)
Change tracking basics
![Page 3: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/3.jpg)
Branching and merging
![Page 4: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/4.jpg)
Conflicts
![Page 5: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/5.jpg)
“Forking” vs branching
![Page 6: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/6.jpg)
Communicating between repositories
![Page 7: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/7.jpg)
Using github as a communications hub
![Page 8: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/8.jpg)
Social policies for actual project management!
![Page 9: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/9.jpg)
A mini-tutorial
![Page 10: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/10.jpg)
A tour of github
![Page 11: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/11.jpg)
Setting up github
Cloning & pulling from github is easy.
…setting it for pushes is not so easy.
This will be a separate lecture…
…but I’m happy to show people how to do it, individually.
(It uses the same kind of ‘key’ auth system that EC2 uses)
![Page 12: LECTURE 14 OCT 22, 2010 Git, in graphic form. Change tracking basics](https://reader036.vdocuments.net/reader036/viewer/2022062516/56649d2d5503460f94a0344e/html5/thumbnails/12.jpg)
Using git in the meantime
Use the ‘git init’, ‘git add’, ‘git commit’, etc.
Copy the entire directory toa rented hard disk, or save it on your laptop.
Copy it back… tada.