using git
play

Using Git Matthieu Moy Matthieu.Moy@univ-lyon1.fr - PowerPoint PPT Presentation

Aug 27, 2022 •268 likes •1.09k views

Intro Git Others Example Advices Using Git Matthieu Moy Matthieu.Moy@univ-lyon1.fr https://matthieu-moy.fr/ September 2018 Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 1 / 35 > Intro Git Others Example Advices

  1. Intro Git Others Example Advices Using Git Matthieu Moy Matthieu.Moy@univ-lyon1.fr https://matthieu-moy.fr/ September 2018 Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 1 / 35 >

  2. Intro Git Others Example Advices Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 2 / 35 >

  3. Intro Git Others Example Advices Outline 1 Revision Control System 2 Git: Basic Principles 3 Git Vs Others 4 An Example Using Git 5 Advices Using Git Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 3 / 35 >

  4. Intro Git Others Example Advices Backups: The Old Good Time Basic problems: ◮ “Oh, my disk crashed.” / “Someone has stolen my laptop!” ◮ “@#%!!, I’ve just deleted this important file!” ◮ “Oops, I introduced a bug a long time ago in my code, how can I see how it was before?” Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 4 / 35 >

  5. Intro Git Others Example Advices Backups: The Old Good Time Basic problems: ◮ “Oh, my disk crashed.” / “Someone has stolen my laptop!” ◮ “@#%!!, I’ve just deleted this important file!” ◮ “Oops, I introduced a bug a long time ago in my code, how can I see how it was before?” Historical solutions: ◮ Replicate: $ cp -r ~/project/ ~/backup/ (or better, copy to a remote machine like pedagolinux) ◮ Keep history: $ cp -r ~/project/ ~/backup/2018-02-02_project ◮ . . . Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 4 / 35 >

  6. Intro Git Others Example Advices Collaborative Development: The Old Good Time Basic problems: Several persons working on the same set of files “Hey, you’ve modified the same file as me, how do we merge?”, 1 “Your modifications are broken, your code doesn’t even compile. Fix your changes 2 before sending it to me!”, “Your bug fix here seems interesting, but I don’t want your other changes”. 3 Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 5 / 35 >

  7. Intro Git Others Example Advices Collaborative Development: The Old Good Time Basic problems: Several persons working on the same set of files “Hey, you’ve modified the same file as me, how do we merge?”, 1 “Your modifications are broken, your code doesn’t even compile. Fix your changes 2 before sending it to me!”, “Your bug fix here seems interesting, but I don’t want your other changes”. 3 Historical solutions: ◮ Never two persons work at the same time. ⇒ Doesn’t scale up! Unsafe. ◮ People work on the same directory (same machine, NFS, ACLs . . . ) ⇒ Painful because of (2) above. ◮ People work trying to avoid conflicts, and merge later. Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 5 / 35 >

  8. Intro Git Others Example Advices Merging: Problem and Solution My version Your version #include <stdio.h> #include <stdio.h> int main () { int main () { printf("Hello"); printf("Hello!\n"); return EXIT_SUCCESS; return 0; } } Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 6 / 35 >

  9. Intro Git Others Example Advices Merging: Problem and Solution My version Your version Common ancestor #include <stdio.h> #include <stdio.h> #include <stdio.h> int main () { int main () { int main () { printf("Hello"); printf("Hello!\n"); printf("Hello"); return EXIT_SUCCESS; return 0; return 0; } } } Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 6 / 35 >

  10. Intro Git Others Example Advices Merging: Problem and Solution My version Your version Common ancestor #include <stdio.h> #include <stdio.h> #include <stdio.h> int main () { int main () { int main () { printf("Hello"); printf("Hello!\n"); printf("Hello"); return EXIT_SUCCESS; return 0; return 0; } } } This merge can be done for you by an automatic tool Merging relies on history! Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 6 / 35 >

  11. Intro Git Others Example Advices Merging: Problem and Solution My version Your version Common ancestor #include <stdio.h> #include <stdio.h> #include <stdio.h> int main () { int main () { int main () { printf("Hello"); printf("Hello!\n"); printf("Hello"); return EXIT_SUCCESS; return 0; return 0; } } } This merge can be done for you by an automatic tool Merging relies on history! Collaborative development linked to backups Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 6 / 35 >

  12. Intro Git Others Example Advices Merging Space of possible revisions (arbitrarily represented in 2D) Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 7 / 35 >

  13. Intro Git Others Example Advices Merging Space of possible revisions (arbitrarily represented in 2D) Mine Yours Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 7 / 35 >

  14. Intro Git Others Example Advices Merging Space of possible revisions (arbitrarily represented in 2D) Mine Yours Ancestor Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 7 / 35 >

  15. Intro Git Others Example Advices Merging Space of possible revisions (arbitrarily represented in 2D) Merged revision Mine Yours Ancestor Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 7 / 35 >

  16. Intro Git Others Example Advices Revision Control System: Basic Idea Keep track of history: ◮ commit = snapshot of the current state, ◮ Meta-data (user’s name, date, descriptive message,. . . ) recorded in commit. Use it for merging/collaborative development. ◮ Each user works on its own copy, ◮ User explicitly “takes” modifications from others when (s)he wants. Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 8 / 35 >

  17. Intro Git Others Example Advices Revision Control System: Basic Idea Keep track of history: ◮ commit = snapshot of the current state, ◮ Meta-data (user’s name, date, descriptive message,. . . ) recorded in commit. Use it for merging/collaborative development. ◮ Each user works on its own copy, ◮ User explicitly “takes” modifications from others when (s)he wants. Efficient storage/compression (“delta-compression ≈ incremental backup”) Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 8 / 35 >

  18. Intro Git Others Example Advices Outline 1 Revision Control System 2 Git: Basic Principles 3 Git Vs Others 4 An Example Using Git 5 Advices Using Git Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 9 / 35 >

  19. Intro Git Others Example Advices Git: Basic concepts Each working directory contains: ◮ The files you work on (as usual) ◮ The history, or “repository” (in the directory .git/ ) Basic operations: ◮ git clone: get a copy of an existing repository (files + history) ◮ git commit: create a new revision in a repository ◮ git pull: get revisions from a repository ◮ git push: send revisions to a repository ◮ git add, git rm and git mv: tell Git which files should be tracked ◮ git status: know what’s going on For us: ◮ Each team creates a shared repository, in addition to work trees Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 10 / 35 >

  20. Intro Git Others Example Advices Outline 1 Revision Control System 2 Git: Basic Principles 3 Git Vs Others 4 An Example Using Git 5 Advices Using Git Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 11 / 35 >

  21. Intro Git Others Example Advices Outline of this section Git Vs Others 3 History Popularity Centralized Vs Decentralized Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 12 / 35 >

  22. Intro Git Others Example Advices A bit of history Avant, on avait SVN et CSV ... Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 13 / 35 >

  23. Intro Git Others Example Advices A bit of history Avant, on avait SVN et CSV ... (Image by: Francois Mori, AP , March 8th 2018, https://pbs.twimg.com/media/DYA0u1_XkAITxLR.jpg:large ) Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 13 / 35 >

  24. Intro Git Others Example Advices A bit of history 1986: Birth of CVS, centralized version system 2000: Birth of Subversion (SVN), a replacement for CVS with the same concepts 2005: First version of Git Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 14 / 35 >

  25. Intro Git Others Example Advices Git and the Linux Kernel 1991: Linus Torvalds starts writing Linux, using mostly tar+patch, 2002: Linux adopts BitKeeper, a proprietary decentralized version control system (available free of cost for Linux), 2002-2005: Flamewars against BitKeeper, some Free Software alternatives appear (GNU Arch, Darcs, Monotone). None are good enough technically. 1 https://ianskerrett.wordpress.com/2014/06/23/eclipse-community-survey-2014-results/ Matthieu Moy (Matthieu.Moy@imag.fr) Git September 2018 < 15 / 35 >

Recommend

More recommend