This document provides an overview of Git and transitioning to Git. It discusses pros and cons of Git including that it works offline, is flexible, reliable, and fast. It provides high-level advice such as getting experts on the team, using a proven workflow, peer review, and mentoring. Technical advice includes using short-lived branches, branching per feature/task, focused commits, and unit tests. Benefits of Git discussed are that it is efficient with text, works around policies, and makes developers stronger. The document also compares Git to SVN.

1. GIT. TRANSITION.
Pavel Grushetzky
pavel_grushetzky pagrus_
pagrus pagrus7

2. Case study
Pros/cons
Inside
High-level advice
Trends
Git overview
Commands Outside
Tools

3. CASE STUDY
- Early 2009
SOA, ESB, SOAP over JMS,
- Big customer/project WSDL 2.0, Agile 2.0, git,
OSGi, virtualization…
- Challenging requirements

4. • Multiple repos
• Topic branch model
• Interactive rebase
• Linear history
• Perfect commits
• Gatekeeper
• Poor GUI tooling (2009)
• First-timers
*simplified

6. Learning curve

7. Consistent workflow
push
Would you review?
fetch
checkout
formatting, javadocs
rebase –i
fixup
push
How about now?
pull

8. Consistent workflow
push
Would you review?
fetch
checkout
formatting, javadocs
rebase –i
fixup
push
How about now?
pull
Conflict

9. Continuous integration
Distribution and branching are the opposite of integration

10. Continuous integration
• Build active branches • “Promiscuous integration”
• Pull when mainline changes • etc

11. Binary content
1 line change => 12kb commit

12. Binary content
1 line change => 12kb commit

13. Advice
Org/Process
Technical

14. • Get experts on the team!
• Proven workflow
• Peer review
• Mentoring
• Gatekeeping

15. • Short-lived branches
• Branch on feature/task
• Focused commits
• Unit Tests

17. Git Benefits
• Works offline
• Flexible
• Reliable & Resilient
• Fast, I mean FAST

18. “I merge 22k files several times a day, and I get unhappy if merge
takes >5 seconds.
And all of those 5 seconds are just the downloading of the deltas.
The merge itself takes less than half a second.”

19. “…it is so fast, you can’t even measure it. That’s creating a branch.”

20. “…if you use windows, you can
probably measure it”
“…it is so fast, you can’t even measure it. That’s creating a branch.”

21. Git Benefits
• Efficient with text
• Handy for local experiments
• Works around stupid policies
• Makes you stronger =)

22. Should I pick
GIT or SVN?

23. Should I pick
GIT or SVN?

24. SHOULD I LEARN GIT?

25. SHOULD I LEARN GIT?

27. Thank you!
Questions?
Comments?
Google
“Linus Torvalds git tech talk”
“Martin Fowler vcs”
And whatever problems you run into…