Comparison of SVN and Git

Recently one of our customers faced the challenge of fixing a production error in his desktop client application. The application is deployed in different versions and may of course be deployed to different customers with a different set of features. Although this scenario seems quite common nowadays, a lot of software companies are not ready to tackle this problem.

Transcript

1. SVN -> G i t Daniel Wieth
2. Classic (SVN) 21.02.2016
3. Modern (Git, Mercurial) 21.02.2016
4. Git 21.02.2016 •„… is a distributed revision control system with an emphasis on speed, data integrity, and support for distributed, non-linear workflows “ (Wikipedia) •Linus Torvalds •/ɡɪt/ •Initial release April 2005
5. Commands: git … 21.02.2016 •init, clone, add •commit •branch, checkout, merge •push, pull, fetch
6. 21.02.2016 4 layers
7. Git vs. SVN 21.02.2016 Git SVN small, fast well…  Distributed central content hashes revision numbers clone last revision
8. 21.02.2016 BRANCHING
9. 21.02.2016 MERGING
10. Git Banches vs. SVN Branches 21.02.2016 Git SVN clear semantics NO semantics Pointer on a commit Folder whole repository arbitrary subtree Really fast well...  complete history is cloned local history
11. Motivation 21.02.2016 •1 product •multiple customers •multiple releases •multiple bugs!
12. Git Flow 21.02.2016
13. 21.02.2016
14. 21.02.2016
15. Pros 21.02.2016 •fast (local operations) •safe / secure (= distributed backup) •modern •total freedom (self-organization)
16. Cons 21.02.2016 •learning curve (?) • Git Flow… •total freedom (??)
17. Thank you! 21.02.2016
18. Literature 21.02.2016 • Git vs SVN - Eine vergleichende Einführung (in German) http://de.slideshare.net/mariomueller/git-vs-svn-eine-vergleichende- einfhrung • git - eine praktische Einführung (in German) http://de.slideshare.net/ephigenia1/git-praktische-einfhrung-13308756 • Git SCM https://git-scm.com/ • A successful Git branching model http://nvie.com/posts/a-successful-git- branching-model/ • Git-Workflows: Der Gitflow-Workflow (Teil 1) (in German) https://blog.seibert-media.net/blog/2014/03/31/git-workflows-der- gitflow-workflow-teil-1/ • Git (Wikipedia) https://en.wikipedia.org/w/index.php?title=Git_(software)&oldid=70176 4449