Getting Your Git On

How do you decide if you should merge or rebase? Should you squash when you do a pull request? Git can be a scary beast, but at the same time it can save you from yourself. Come and get tuned into the basics of git and get ready to master the commands that will tame the beast. We'll cover interactive rebasing, best practices when working in open source, bisecting your code to locate regressions, resetting your code and working with pull requests. We'll share in open discussion about our experiences and then tackle the tough bits. We'll also walk through a lab to really dive into the commands and gain a solid understanding of what is happening behind the scenes.

Transcript

1. Awwwyeah, git. Getting Your git On From init to bisect
2. James Chambers @CanadianJames james@jameschambers.com http://jameschambers.com
5. Repository Server Working Copy Working Copy Working Copy Centralized Source Control Server is the source of truth Checkout files to indicate intent Commits happen against the server Updates happen from the server
6. Repository Repository + Working Copy Repository + Working Copy Repository + Working Copy Distributed Source Control Each repository is a source of truth Create remote branches to share intent Commits happen in a local graph Push and pull to remote repositories to sync
7. Repository Repository + Working Copy Repository + Working Copy Distributed Source Control
9. Yes, let us use distributed technologies. That way we can trade our problems for distributed problems. - Internet advocate, Abe Lincoln
10. Benefits and Challenges of Distribution Good Things Things to Consider Faster workflows Hard to enforce policy Easier experimentation Loss of visibility Lighter branching Branch “blooms” Freedom for private integrations Replication of desired integrations Free to work where needed More complicated merges Anyone can create Anyone can create
11. Benefits of git • Cheap branches • Really good diff engine • Great tool chain • Extensible and customizable
12. Tenets of Git • It’s a history of source code, composed of a series commits • Commits exist primarily on a branch • Branches can grow and diverge in parallel • It’s a directed, acyclic graph • It’s powerful and terrific and complicated
13. Tenets of Git • It’s a history of source code, composed of a series commits • Commits exist primarily on a branch • Branches can grow and diverge in parallel • It’s a directed, acyclic graph • It’s powerful and terrific and complicated • It’s powerrificated • The basics support 90% of what we typically do • There are great tools for another 6% • For the other 4%...there is StackOverflow
15. git init git add . git commit -m “message“
17. git ammend git log git branch git checkout git checkout -b "new branch"
18. Syncing with Other Repositories
19. git fetch git pull git push git fetch origin git push –f
20. Basic Merging
21. git merge git checkout master git merge bugfix
22. Avoiding Conflict
23. git rebase git rebase master git rebase master -i
24. Excrement and the Oscillating Device
25. git rebase –i ^^ CONFLICTS!?!
26. Prep the Patient
27. git bisect start git bisect bad git bisect good git bisect bad git bisect good git bisect bad git bisect good git bisect bad git bisect reset Or...
28. git bisect start git bisect bad git bisect good ref git bisect command git bisect reset
29. Break and Lab
30. http://bit.ly/git-ftw
31. James Chambers @CanadianJames http://jameschambers.com http://AspNetMonsters.com @AspNetMonsters Simon Timms David Paquette