Git (Tak. Po prostu.)
33
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
-
Upload
konrad-malawski -
Category
Technology
-
view
663 -
download
3
description
Slides helping me explain how git works and help the crowd keep their focus high during the whole presentation. The presentation was mostly "hands on committing" thats why there are almost no commands or output in the slides. For more, read bellow... :-) STORY: These slides where used by my on my first ever talk to an bigger and competent audience - during the 5th JavaCamp organized by "us" (meaning the Polish Java User Group). Q: So... why are they so "silly"? A: I would NOT call them silly! An GOOD presentation is all about the speaker and the interaction with the audience. These slides serve only the purpose of helping me keep track of our progress, and help the audience to NOT lose their focus on the subject at any given time. What would you prefer: a list of 30 git commands, and then 30 slides "commit does xyz; merge does zyx;..."? I hope you got my point there... ;-) Anyways, please keep in mind it was an hands on session, and not "just slides" :-) Cheers! (oh, and give git a try http://git-scm.com/) You can and should also visit my blog if you want more this, or me et cetera... :-)
Transcript of Git (Tak. Po prostu.)
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Tak.
Tak.Po prostu.
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Masz pytanie?Nie czekaj do końca prezentacji!
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
„SVN (-HELL)“ *
* Ten slajd jak i całą tą prezentację należy traktować z przymróżeniem oka – dziękuję :-)
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
„SVN (-HELL)“ *
Jedno jedyne repozytorium„One to Rule Them All“
Brak współpracy bezpośrednio
między developerami
Branch „udaje“, Rzadko robiony Merge nie są
wygodne
Każdy commit trafia do repo, testuje go CI, zatem każdy commit musi być czymś „done“
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Helo (Git) World!
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Model niby-rozproszony
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Shall I push or shall I pull..?
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
SVN ogranicza się do...
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
SVN ogranicza się do...
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Commit thyself, Lancelot!
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
SVN (etc) look at files...
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Git looks into their SOULS (content)...
BlobTree
CommitTag
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Nie ma treści = nie ma nic.
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
BRANCH + MERGE
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
BRANCH + MERGE
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
BRANCH + MERGE
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
BRANCH + MERGE
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Poważne BRANCHowanie:
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
So many heads...?
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
„Pierwszy raz“
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
„Pierwszy raz“ - dziwnie?
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
FF
FAST FORWARD MERGE
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
--NO-FF
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Oraz usuwanie brancha
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
OCTOPUS
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
OCTOPUS (MERGE ENGINE)
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
STASH
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
TAG
svn copy http://svn.example.com/repos/calc/trunk \ http://svn.example.com/repos/calc/tags/release-1.0 \ -m "Tagging the 1.0 release of the 'calc' project."
= Git tag release-1.0
git tag -am "super nam poszlo!!!" release-1.0 b8b9a69e5629b6b450
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Poznaliśmy również podstawy:
Bazaar
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
ありがとうありがとう(DZIĘKUJĘ)(DZIĘKUJĘ)
ZA UWAGĘ!ZA UWAGĘ!
Konrad „Ktoso“ Malawski – [email protected] - @ktosopl – blog.project13.pl – JavaCamp #5 - 06.11.2010
Pytanie Bonusowe: Co to jest?
