Git for SVN users, Tech talk week @ outbrain

Transcript

1. Git Introduction For Subversion Users Ran Tavory Attributed to Totango
2. Who am I • A Developer, of course… • Migrated two teams from SVN to Git • Gormim
4. Why git?
5. Why Git? • IT IS BETTER. There’s a site for that.
6. Git is a File System
7. All (most) Operations are Local and Fast! • Commit • Log (view history) • Diff • ...
8. Git is Distributed
9. Git is Fast
10. Lightweight (and local) Branching
11. Data Integrity
12. Staging Area
13. Stash Area
15. Setup
16. Git Setup $ brew install git! $ git config --global user.name “Ran Tavory”! $ git config --global user.email “rantav@gmail.com” https://gist.github.com/rantav/ 5d6fb14057f062ecbc70
17. GitHub Setup https://help.github.com/articles/ set-up-git
18. Clone the Repo $git clone https://github.com/ rantav/devdev.git
19. The Basics
20. git status
21. git add
22. git diff
23. git diff More here: http://www.gitguys.com/topics/git-diff/
24. git commit
25. git commit --amend
26. git checkout
27. git rm
28. git mv
29. git log
30. git log -p
31. git log --word-diff
32. git log --stat
33. git log hacking
34. git remote
35. git pull
36. To rebase or not to rebase? • Prefer rebase • this keeps the commit log cleaner •git pl! • Sometimes an actual merge is needed • So don’t rebase • For example, when merging branches
37. git push
38. SVN Parallels
39. Git for SVN
40. Git for SVN
41. Git for SVN
42. Git Lifecycle
43. Git Lifecycle
44. The Staging Area
    (AKA The Index)
45. Branching
46. Text http://pcottle.github.io/learnGitBranching/?demo A cool demo
47. Branching
48. Branching
49. Branching - Merging
    (fast forward)
50. Branching - Deleting
51. Branching
    cont
52. Branching - Merging
    (3 way merge)
53. Branching - Management
54. Branching - Remote
55. Branching - Remote
56. Branching - Remote
57. Branching - Remote git pull == git fetch && git merge
58. Branching - Pushing Requires tracking
59. Deleting Remote Branches
60. Pull Requests
61. Creating a Pull Request 1 2 3 4
62. Reviewing a Pull Request
63. Merging Pull Request
    Online
64. Merging Pull Requests
    Offline •Resolve Conflicts •Test •Improve
65. Deleting Branch
    After PR Merge
66. Git Flow
68. 1. Create a Branch git co -b bug-157 Branch Naming: bug-xxx! feature-yyy! wip-zzz
69. 2. Add Commits Commit messages are super important!!!
70. 3. Open a Pull Request Make sure you assign a reviewer!
71. 4. Discuss
    AKA Code Review Continue to commit and push. This will be reflected
72. 5. Merge Merge means: It’s good for production. master is always deployable
73. Pull Request Demo
74. Code Review
75. Code Review
76. Protips
77. Protip: How to transition your team from svn to git 1. Use git-svn, or Svn2git 2. Start using git “as svn” eg no branches 3. Start using branches and pull requests (if github) 4. Personal opinion: Use only CLI tools
78. Protip: git rebase -i
79. Protip: zsh integration
80. Protip: git stash
81. Extra
82. Conflicts
83. Conflicts
    Edit Collision # Edit file and then $ git add! $ git commit
84. Conflicts
    Removed File
85. Conflicts
    Removed File - Keep
86. Conflicts
    Removed File - Remove
87. Conflicts
    Git Mergtool • Not covered here... • http://git-scm.com/docs/git-mergetool
88. Conflicts
    While Rebasing
89. Learning More
90. Refs http://git-scm.com/about http://thkoch2001.github.io/whygitisbetter/ http://www.slideshare.net/manishchaks/subversion- to-git-migration http://www.git-tower.com/blog/git-for-subversion- users-cheat-sheet-detail/ http://git.or.cz/course/svn.html (or: where did I steal from?)
91. Refs https://help.github.com/articles/resolving-a-merge-conflict- from-the-command-line http://pcottle.github.io/learnGitBranching/ http://jeffkreeftmeijer.com/2010/the-magical-and-not- harmful-rebase/ https://help.github.com/articles/using-pull-requests https://help.github.com/articles/creating-a-pull-request http://en.wikipedia.org/wiki/ Coupling_(computer_programming)