2. git
⢠What is it?
⢠Why is it different?
⢠What can I do with it?
⢠How can I use git if my project uses svn?
⢠What alternatives exist?
3. Caveats
⢠Iâve only been using it for a few weeks
⢠Just scratching the surface
⢠I may be doing it all wrong
⢠For all I know it may be eating all my ďŹles
when Iâm not looking
⢠...but I like it so far :-)
5. History
rcs cvs svn git
Alice Repository Bob
Versioning of individual ďŹles. Files must be locked before commit. No automatic merging.
6. History
rcs cvs svn git
Alice Repository Bob
Versioning of individual ďŹles. No locking. Automatic merging.
7. History
rcs cvs svn git
Alice Repository Bob
Versioning of entire project. No locking. Automatic merging.
8. History
rcs cvs svn git
Alice Bob
Each user has his own repository. No [need for a] central repository.
9. Some Advantages
⢠No reliance on central repository
⢠OfďŹine commits
⢠Local branching
⢠Merging that doesnât suck
⢠Flexible collaboration
⢠Interoperates with svn