Slide 1

Slide 1 text

SVN -> G i t Daniel Wieth

Slide 2

Slide 2 text

Classic (SVN) 21.02.2016

Slide 3

Slide 3 text

Modern (Git, Mercurial) 21.02.2016

Slide 4

Slide 4 text

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

Slide 5

Slide 5 text

Commands: git … 21.02.2016 •init, clone, add •commit •branch, checkout, merge •push, pull, fetch

Slide 6

Slide 6 text

21.02.2016 4 layers

Slide 7

Slide 7 text

Git vs. SVN 21.02.2016 Git SVN small, fast well…  Distributed central content hashes revision numbers clone last revision

Slide 8

Slide 8 text

21.02.2016 BRANCHING

Slide 9

Slide 9 text

21.02.2016 MERGING

Slide 10

Slide 10 text

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

Slide 11

Slide 11 text

Motivation 21.02.2016 •1 product •multiple customers •multiple releases •multiple bugs!

Slide 12

Slide 12 text

Git Flow 21.02.2016

Slide 13

Slide 13 text

21.02.2016

Slide 14

Slide 14 text

21.02.2016

Slide 15

Slide 15 text

Pros 21.02.2016 •fast (local operations) •safe / secure (= distributed backup) •modern •total freedom (self-organization)

Slide 16

Slide 16 text

Cons 21.02.2016 •learning curve (?) • Git Flow… •total freedom (??)

Slide 17

Slide 17 text

Thank you! 21.02.2016

Slide 18

Slide 18 text

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