effectivetrainings.de - besser gits nicht - best practices mit git

105
KAFFEE

Upload: effectivetrainings

Post on 18-Jul-2015

588 views

Category:

Education


0 download

TRANSCRIPT

KAFFEE

Besser Gits nichtBest Practices mit GIT

Martin DilgerEffective Trainings & Consulting

effectivetrainings.de

effectivetrainings.de

effectivetrainings.deerstellt auf sp-studio.de

effectivetrainings.de

Source Code

unter:

ssh://user@

127.0.0.1/

git

effectivetrainings.deerstellt auf sp-studio.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

Best Practice #1

effectivetrainings.de

Best Practice #1

Unterschätzen Sie die Kommandozeile nicht!

KAFFEE

effectivetrainings.de

Best Practice #1

Unterschätzen Sie die Kommandozeile nicht!

effectivetrainings.de

Best Practice #1

Unterschätzen Sie die Kommandozeile nicht!

effectivetrainings.de

working copy

effectivetrainings.de

working copy index

effectivetrainings.de

working copy index repo

effectivetrainings.de

working copy index repo

Edit

effectivetrainings.de

working copy index repo

Edit Add

effectivetrainings.de

working copy index repo

Edit Add Commit

effectivetrainings.de

working copy index repo

Edit Add Commit

effectivetrainings.de

working copy index repo

Edit Add Commit

effectivetrainings.de

working copy index repo

Edit Add Commit

effectivetrainings.de

working copy index repo

Edit Add Commit

effectivetrainings.de

working copy index repo

Edit Add Commit

effectivetrainings.de

working copy index repo

Edit Add Commit

effectivetrainings.de

working copy index repo

Edit Add Commit

effectivetrainings.de

working copy index repo

Edit Add Commit

effectivetrainings.de

working copy index repo

Edit Add Commit push

effectivetrainings.de

working copy index repo

Edit Add Commit push

Clone

KAFFEE

effectivetrainings.de

effectivetrainings.de

effectivetrainings.de

Best Practice #2

effectivetrainings.de

Best Practice #2

Pro Feature ein Feature-Branch

Myfile.txt

Myfile.txt

Myfile.txtOther.txt

Myfile.txt

Myfile.txtOther.txt

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txt

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txt

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txtMyfile.txt

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txtMyfile.txt

Mergebasis

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtMyfile.txtBranch.txt

Mergebasis

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtMyfile.txtBranch.txt

Other.txtText.txt

Mergebasis

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtBranch.txtOther.txt

Text.txt

Other.txtText.txt Other.txt

Myfile.txtBranch.txt

Mergebasis

effectivetrainings.de

Die Fähigkeit

Präsentations-

technik

fließt mit

in das

Gehalt mit ein.

effectivetrainings.de

KAFFEE

effectivetrainings.de

Best Practice #2

Pro Feature ein Feature-Branch

effectivetrainings.de

Best Practice #2

Pro Feature ein Feature-Branch

effectivetrainings.de

Best Practice #3

effectivetrainings.de

Best Practice #3

Deny non-fast forward or smoke in hell

KAFFEE

effectivetrainings.de

Best Practice #3

Deny non-fast forward or smoke in hell

effectivetrainings.de

Best Practice #3

Deny non-fast forward or smoke in hell

git config --global receive.denyNonFastForwards true

effectivetrainings.de

Best Practice #4

effectivetrainings.de

Best Practice #4

git pull --rebase gegen Remotes, git merge lokal.

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtBranch.txtOther.txt

Text.txt

Other.txtText.txt Other.txt

Myfile.txtBranch.txt

Mergebasis

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtText.txt

Other.txtMyfile.txtBranch.txt

Mergebasis

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtText.txt

Other.txtMyfile.txtBranch.txt

Mergebasis

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtText.txt

Other.txtMyfile.txtBranch.txt

Mergebasis

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtText.txt

Other.txtMyfile.txtBranch.txt

Mergebasis

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtText.txt

Other.txtMyfile.txtBranch.txt

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtText.txt

Other.txtMyfile.txtBranch.txt

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtText.txt

Other.txtMyfile.txtBranch.txt

Myfile.txt

Myfile.txtOther.txt

Other.txtMyfile.txtBranch.txt

Other.txt

Other.txtText.txt

Other.txtMyfile.txtBranch.txt

effectivetrainings.de

Best Practice #4

git pull --rebase gegen Remotes, git merge lokal.

KAFFEE

effectivetrainings.de

Best Practice #4

git pull --rebase gegen Remotes, git merge lokal.

effectivetrainings.de

Best Practice #4

git pull --rebase gegen Remotes, git merge lokal.

effectivetrainings.de

Best Practice #5

effectivetrainings.de

Best Practice #5

commit often,polish later,push once.

effectivetrainings.de

Das berechnete

Gehalt soll rot

und prominenter

dargestellt werden.

KAFFEE

effectivetrainings.de

Best Practice #5

commit often,polish later,push once.

effectivetrainings.de

Best Practice #5

commit often,polish later,push once.

effectivetrainings.deerstellt auf sp-studio.de

effectivetrainings.de

Best Practice #6

effectivetrainings.de

Best Practice #6

Last but not Least!

effectivetrainings.de

Best Practice #6

Haben Sie Spaß mit GIT!

effectivetrainings.de

Best Practice #6

Haben Sie Spaß mit GIT!

effectivetrainings.de

Kontakt: [email protected] gleich anschließend im Foyer!

http://www.effectivetrainings.de

Effective Trainings & Consulting

effectivetrainings.de

Kontakt: [email protected] gleich anschließend im Foyer!

http://www.effectivetrainings.de

Effective Trainings & Consulting

effectivetrainings.de

Kontakt: [email protected] gleich anschließend im Foyer!

http://www.effectivetrainings.de

Effective Trainings & Consulting

KAFFEE