Kako koristiti i iskoristiti Git

Talk about Git usage best practices at eStudent App Start Contest 2012. Croatian language.

Transcript

1. App Start Contest
   Timski razvoj aplikacija
   Kako koristiti i iskoristiti Git
   

   View Slide

2. App Start Contest
   

   View Slide

3. App Start Contest
   Git
   (Distribuirano) verzioniranje sadržaja
   (CVS, SVN, TFS, Bazaar, Darcs, Perforce, ...)
   

   View Slide

4. App Start Contest
   Git
   V1
   V2
   V3
   . . .
   

   View Slide

5. App Start Contest
   Single-user Git
   Beskonačni undo
   

   View Slide

6. App Start Contest
   git checkout
   V1
   V2
   V3
   V4
   git checkout V2
   V1
   V2
   

   View Slide

7. App Start Contest
   Single-user Git
   Dokumentacija
   

   View Slide

8. App Start Contest
   git log
   V1
   V2
   V3
   . . .
   Započeo projekt, zasad samo početni ekran
   Dodao ulogiravanje korisnika i kreiranje računa
   Dodao slanje poruka drugim korisnicima
   1.1.2012.
   12.3.2012.
   28.5.2012.
   

   View Slide

9. App Start Contest
   git log
   V1.1.1
   V1.1.2
   V1.1.3
   . . .
   Dodao tablicu Korisnik u bazu
   Prepravio Korisnik tablicu, želimo imati samo jedno
   polje za ime i prezime (http://bit.ly/92Lw0V)
   Dodao triggere jer SQLite nema foreign key
   constraintove prije 3.6.19 :(
   5.1. 16:53
   5.1. 17:28
   5.1. 19:13
   

   View Slide

10. App Start Contest
    Single-user Git
    Eksperimentiranje
    

    View Slide

11. App Start Contest
    git branch
    V1
    V2
    V3
    . . .
    Exp V4
    Exp V5
    "master"
    branch
    "experiment"
    branch
    

    View Slide

12. App Start Contest
    feature branches
    V1
    V2
    V3
    . . .
    reg-1
    reg-2
    "master"
    branch
    "user-registration"
    branch
    fb-1
    fb-2
    report-1
    report-2
    "connect-to-facebook"
    branch
    "reports"
    branch
    

    View Slide

13. App Start Contest
    git merge
    V1
    V2
    V3
    merge
    V4
    reg-1
    reg-2
    fb-1
    fb-2
    report-1
    report-2
    fb-3
    

    View Slide

14. App Start Contest
    Timski rad (napokon)
    V1
    V2
    V3
    merge
    V4
    reg-1
    reg-2
    fb-1
    fb-2
    report-1
    report-2
    fb-3
    Mirko
    Slavko
    Ana
    "master"
    branch
    

    View Slide

15. App Start Contest
    Git "server"
    Dijeljeni direktorij (Dropbox, ...)
    GitHub, Bitbucket, Assembla, ...
    Self hosted (gitlab, gitolite, SSH)
    

    View Slide

16. App Start Contest
    Git "klijent"
    

    View Slide

17. App Start Contest
    Git repository
    origin
    Slavko
    Ana
    Mirko
    

    View Slide

18. App Start Contest
    GitHub flow : 0. clone (fork)
    origin
    (GitHub)
    Mirko
    (laptop)
    git clone github.com/org/projekt.git
    

    View Slide

19. App Start Contest
    GitHub flow : 1. branch
    git branch report master
    git checkout report
    master report
    

    View Slide

20. App Start Contest
    

    View Slide

21. App Start Contest
    GitHub flow : 2. commit
    git add file1 file2 ...
    git commit
    report
    v1
    report
    v2
    Psst, hint: "add" zapravo nije "add" nego "prepare"
    

    View Slide

22. App Start Contest
    GitHub flow : 3. push
    Mirko
    (laptop)
    origin
    (GitHub)
    git push origin report:report
    report
    

    View Slide

23. App Start Contest
    GitHub flow : 4. pull request
    master report
    "Hey, I just pushed,
    and this is crazy,
    but here’s my commit,
    so merge it maybe?"
    

    View Slide

24. App Start Contest
    GitHub flow : 5. code review
    

    View Slide

25. App Start Contest
    GitHub flow : 6. merge
    master report
    git checkout master
    git merge report
    

    View Slide

26. App Start Contest
    GitHub flow : 7. pull
    origin
    (GitHub)
    Mirko
    (laptop)
    git pull origin
    

    View Slide

27. App Start Contest
    "Release" branch
    A
    B
    C
    . . .
    Ver1
    Ver1
    hotfix
    "master"
    branch
    "version-1"
    branch
    

    View Slide

28. App Start Contest
    Automatizirani build
    origin
    (GitHub)
    buildbot
    (Travis-CI)
    git clone github.com/org/projekt.git
    pip install -r requirements.txt
    make test
    merge
    

    View Slide

29. App Start Contest
    Automatizirani build
    

    View Slide

30. App Start Contest
    Continuous deployment (web)
    Master always deployable
    Small changes
    

    View Slide

31. App Start Contest
    Continuous deployment (web)
    origin
    (GitHub)
    buildbot
    (Travis-CI)
    git clone github.com/org/projekt.git
    pip install -r requirements.txt
    make test
    git push heroku
    merge production
    (Heroku)
    success
    fail
    

    View Slide

32. App Start Contest
    Više informacija
    Uvod u Git
    http://bit.ly/LDqq0N
    How GitHub uses GitHub to build GitHub
    http://bit.ly/n3a5VZ
    

    View Slide

33. App Start Contest
    Demo time
    

    View Slide