Get ready to be Giti!ed

Valentin Bora

Geek,

$ whoami

freelance web developer

nederland

@valentinbora

Student laComputing & Psychology

contact@valentinbora.com

încă un tool?

dacă n-ar "nu s-ar povesti

VCSVersionControlSystem

Câțiva jucători

CVS

SVN

GitBazaarMercurial

the players

Today’s villain

Subversion

Subversion

Aaaaargh...

I kill you!

Subversion

are timpca-n Ardeal

Subversion

./translations

./translations/.svn

./translations/.svn/all-wcprops

./translations/.svn/entries

./translations/.svn/prop-base

./translations/.svn/prop-base/en.mo.svn-base

./translations/.svn/prop-base/nl.mo.svn-base

./translations/.svn/props

./translations/.svn/text-base

./translations/.svn/text-base/en.mo.svn-base

./translations/.svn/text-base/en.po.svn-base

./translations/.svn/text-base/nl.mo.svn-base

./translations/.svn/text-base/nl.po.svn-base

./translations/.svn/tmp

./translations/.svn/tmp/prop-base

./translations/.svn/tmp/props

./translations/.svn/tmp/text-base

./translations/en.mo

./translations/en.po

./translations/nl.mo

./translations/nl.po

./verdana.ttf

./views

./views/.DS_Store

./views/.svn

./views/.svn/all-wcprops

./views/.svn/entries

./views/.svn/prop-base

./views/.svn/props

./views/.svn/text-base

./views/.svn/tmp

./views/.svn/tmp/prop-base

./views/.svn/tmp/props

./views/.svn/tmp/text-base

./views/layouts

./views/layouts/.svn

pune.svnin

fiecarefolder

Subversioncopiază

cod din altproiect

Subversion

branching is pleasure

NOT!

We have a hero

?

(aplauze)

Git

is fastGit

is greenGit

- nu poluează

Gitloves branches

Gitcopy-pasted code

friendly

Gittrain

friendly

Git

CentralisedWorkflow

Integration managerWorkflow

Git frenzy

github.com/facebook

github.com/yahoo

github.com/techcrunch

github.com/rails

cine mai folosește git

să fie clargit is not SVN

not an evolution

let’s get dirty

set up shop$ git config --global user.name "Geek"$ git config --global user.email geek@geekland.com

attack of the clones$ git clone ssh://geekmeet@valentinbora.com/~/geekmeet.git

now push$ git push origin master

now pull$ git pull

other stuff

$ git mergetool

$ git checkout -b branchy$ git checkout master$ git merge branchy$ git svn clone repo-url --trunk=trunk --branches=branches --tags=tags$ git status$ git reset HEAD <file>$ git checkout -- <file>

other stuff

$ git mergetool

$ git checkout -b branchy$ git checkout master$ git merge branchy$ git svn clone repo-url --trunk=trunk --branches=branches --tags=tags$ git status$ git reset HEAD <file>$ git checkout -- <file>

other stuff

$ git mergetool

$ git checkout -b branchy$ git checkout master$ git merge branchy$ git svn clone repo-url --trunk=trunk --branches=branches --tags=tags$ git status$ git reset HEAD <file>$ git checkout -- <file>

other stuff

$ git mergetool

$ git checkout -b branchy$ git checkout master$ git merge branchy$ git svn clone repo-url --trunk=trunk --branches=branches --tags=tags$ git status$ git reset HEAD <file>$ git checkout -- <file>

other stuff

$ git mergetool

$ git checkout -b branchy$ git checkout master$ git merge branchy$ git svn clone repo-url --trunk=trunk --branches=branches --tags=tags$ git status$ git reset HEAD <file>$ git checkout -- <file>

other stuff

$ git mergetool

$ git checkout -b branchy$ git checkout master$ git merge branchy$ git svn clone repo-url --trunk=trunk --branches=branches --tags=tags$ git status$ git reset HEAD <file>$ git checkout -- <file>

other stuff

$ git mergetool

$ git checkout -b branchy$ git checkout master$ git merge branchy$ git svn clone repo-url --trunk=trunk --branches=branches --tags=tags$ git status$ git reset HEAD <file>$ git checkout -- <file>

other stuff

$ git mergetool

$ git checkout -b branchy$ git checkout master$ git merge branchy$ git svn clone repo-url --trunk=trunk --branches=branches --tags=tags$ git status$ git reset HEAD <file>$ git checkout -- <file>

other stuff

$ git mergetool

$ git checkout -b branchy$ git checkout master$ git merge branchy$ git svn clone repo-url --trunk=trunk --branches=branches --tags=tags$ git status$ git reset HEAD <file>$ git checkout -- <file>

Întrebări

?

@valentinbora

contact@valentinbora.com

Thank you?