GIT x SVN

Old Git x SVN presentation showing the benefits of using git-svn vs. SVN (which we were stuck to using at the time).

Transcript

1. GIT atomic commits branches soft tags rebase merge merge conflicts Friday, May 24, 13
2. SVN legacy codebase Friday, May 24, 13
3. GIT-SVN allows you to work with legacy codebases and UNLEASH THE POWER OF GIT Friday, May 24, 13
4. ATOMIC COMMITS allows you to pinpoint your commits instead of commiting a bunch of code all the time Friday, May 24, 13
5. ATOMIC COMMITS Demo Friday, May 24, 13
6. BRANCHES local branches low-cost branches easy merge (we’ll talk about this later) Friday, May 24, 13
7. BRANCHES Demo Friday, May 24, 13
8. TAGS soft tags easy as hell terribly low cost, comparing to SVN Friday, May 24, 13
9. TAGS This Demo would bring tears to yours eyes, so we’ll skip it Friday, May 24, 13
10. Friday, May 24, 13
11. REBASE clean version tree Friday, May 24, 13
12. Friday, May 24, 13
13. REBASE Demo Friday, May 24, 13
14. MERGE Useful between branches Not much point in SVN We lose history in SVN But worth learning Friday, May 24, 13
15. MERGE Demo Friday, May 24, 13
16. MERGE CONFLICTS OMG CONFLICT!!1!1!one!1! What to do? Friday, May 24, 13
17. MERGE CONFLICTS Demo Friday, May 24, 13
18. GIT SVN branches in SVN tags in SVN tags as branches? rebase dcommit Friday, May 24, 13
19. GIT SVN git svn is like a namespace branches and tags are just copies git considers tags as branches (and they are) each commit is a revision Friday, May 24, 13
20. GIT SVN git svn... this will be a remote action Friday, May 24, 13
21. GIT SVN git svn branch awesome_branch -m “we’re awesome” Friday, May 24, 13
22. GIT SVN git svn tag 666 -m “the one for you and me” Friday, May 24, 13
23. GIT SVN 56f9452b7c411830fb6101208ace01ddcc4496fb actually is 2053 Friday, May 24, 13
24. GIT SVN this is not good! revisions spread across tags and branches but cannot be carried across them commits can be shared, but they are unique Friday, May 24, 13
25. EXTRAS git cherry-pick git checkout git stash git grep Friday, May 24, 13
26. THANK YOU! Pedro Nascimento HE:labs pedro@helabs.com.br @lunks Friday, May 24, 13