SVN -> G i tDaniel Wieth

Classic (SVN)

21.02.2016

Modern (Git, Mercurial)

21.02.2016

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

Commands: git …

21.02.2016

• init, clone, add

• commit

•branch, checkout, merge

•push, pull, fetch

21.02.2016

4 layers

Git vs. SVN

21.02.2016

Git SVN

small, fast well…

Distributed central

content hashes revision numbers

clone last revision

21.02.2016

BRANCHING

21.02.2016

MERGING

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

Motivation

21.02.2016

•1 product

•multiple customers

•multiple releases

•multiple bugs!

Git Flow

21.02.2016

21.02.2016

21.02.2016

Pros

21.02.2016

• fast (local operations)

• safe / secure (= distributed backup)

•modern

• total freedom (self-organization)

Cons

21.02.2016

• learning curve (?)• Git Flow…

• total freedom (??)

Thank you!

21.02.2016

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=701764449