Improve Your Development Process with Git

An introduction to the benefits of Git for your development process that I gave at cf.Objective(ANZ) 2011.

Transcript

1. Improve Your Development Process with Git @lachlanhardy
2. Who am I? ✦ Lachlan Hardy
3. Who am I? ✦ Lachlan Hardy ✦ I lead development at Ninefold
4. Who am I? ✦ Lachlan Hardy ✦ I lead development at Ninefold ✦ I’ve lead teams at News Digital Media, Atlassian and BigPond IPTV
5. Who am I? ✦ Lachlan Hardy ✦ I lead development at Ninefold ✦ I’ve lead teams at News Digital Media, Atlassian and BigPond IPTV ✦ I like Ruby, JavaScript and making awesome web stuff.
6. What is Git? ✦ Open source
7. What is Git? ✦ Open source ✦ Distributed version control system
8. What is Git? ✦ Open source ✦ Distributed version control system ✦ Designed for speed and efficiency
9. What is Git?
10. What is Git? ✦ local copy is a full copy Distributed
11. What is Git? ✦ local copy is a full copy ✦ local copy is a backup Distributed
12. What is Git? ✦ local copy is a full copy ✦ local copy is a backup ✦ commit to local copy Distributed
13. What is Git? ✦ local copy is a full copy ✦ local copy is a backup ✦ commit to local copy ✦ work offline Distributed
14. What is Git? ✦ perform diffs Work Offline
15. What is Git? ✦ perform diffs ✦ commit changes Work Offline
16. What is Git? ✦ perform diffs ✦ commit changes ✦ switch branches Work Offline
17. What is Git? ✦ perform diffs ✦ commit changes ✦ switch branches ✦ merge branches Work Offline
18. What is Git? ✦ Snapshots, not deltas Speed and Efficiency
19. What is Git? ✦ Snapshots, not deltas ✦ Commit-based logic Speed and Efficiency
20. What is Git? ✦ Snapshots, not deltas ✦ Commit-based logic ✦ Each commit has access to full history Speed and Efficiency
21. Setting up a repository $ git config --global user.name “Lachlan Hardy” $ git config --global user.email “lachlan@ninefold.com” Configuration
22. Setting up a repository $ cd example/ $ git init master $ touch README master $ git add . master $ git commit -m “This is my first commit.” Create
23. Setting up a repository $ git clone git://example.com/repository/ example.git $ cd example/ Clone
24. Developer Workflow ✦ Topic Branching
25. Developer Workflow ✦ Topic Branching ✦ Commit work locally
26. Developer Workflow ✦ Topic Branching ✦ Commit work locally ✦ Update local copy
27. Developer Workflow ✦ Topic Branching ✦ Commit work locally ✦ Update local copy ✦ Merge work to trunk and push to server
28. Developer Workflow master $ git pull origin master Topic Branching
29. Developer Workflow master $ git pull origin master master $ git checkout -b new-feature Topic Branching
30. Developer Workflow master $ git pull origin master master $ git checkout -b new-feature new-feature $ ...do some stuff... Topic Branching
31. Developer Workflow new-feature $ git status Commit Work Locally
32. Developer Workflow new-feature $ git status new-feature $ git add changed-file.txt Commit Work Locally
33. Developer Workflow new-feature $ git status new-feature $ git add changed-file.txt new-feature $ git commit -a “I changed a file” Commit Work Locally
34. Developer Workflow new-feature $ git checkout master Update Local Copy
35. Developer Workflow new-feature $ git checkout master master $ git pull origin master Update Local Copy
36. Developer Workflow master $ git merge new-feature Merge Work to Trunk and Push to Server
37. Developer Workflow master $ git merge new-feature master $ git push origin master Merge Work to Trunk and Push to Server
38. Working in a team ✦ Work locally
39. Working in a team ✦ Work locally ✦ Share work without a server
40. Working in a team ✦ Work locally ✦ Share work without a server ✦ Test code locally in isolation
41. Working in a team ✦ Work locally ✦ Share work without a server ✦ Test code locally in isolation ✦ Commit to the server without breaking builds
42. Working in a team ✦ Work locally ✦ Share work without a server ✦ Test code locally in isolation ✦ Commit to the server without breaking builds ✦ A broken build doesn’t stop development
51. Questions? ✦ lachlan@lachstock.com.au ✦ @lachlanhardy ✦ http://git-scm.com/