Crie, colabore e evolua com Git

Slide 1

Slide 1 text

Slide 2

Slide 2 text

Alex Tercete Desenvolvedor

Slide 3

Slide 3 text

https://www.flickr.com/photos/delphaber/6382586609

Slide 4

Slide 4 text

logo.psd

Slide 5

Slide 5 text

logo.psd logo versão 2.psd

Slide 6

Slide 6 text

logo.psd logo versão 2.psd logo final.psd logo final FINAL.psd logo final FINAL AGORA VAI.psd

Slide 7

Slide 7 text

projeto-2013-04-21.zip projeto-2013-09-07.zip projeto-2013-11-15.zip

Slide 8

Slide 8 text

https://www.flickr.com/photos/esparta/1609874001

Slide 9

Slide 9 text

https://www.flickr.com/photos/amsterdamprinting/6984521859

Slide 10

Slide 10 text

No content

Slide 11

Slide 11 text

SISTEMAS DE CONTROLE DE VERSÃO

Slide 12

Slide 12 text

No content

Slide 13

Slide 13 text

Slide 14

Slide 14 text

Slide 15

Slide 15 text

t A B C A C B B C A D + D A B - D C - D F A A A F +

Slide 16

Slide 16 text

t A A

Slide 17

Slide 17 text

Slide 18

Slide 18 text

principal tarefa B tarefa A t

Slide 19

Slide 19 text

principal tarefa B tarefa A t

Slide 20

Slide 20 text

principal tarefa B tarefa A t

Slide 21

Slide 21 text

principal tarefa B tarefa A t

Slide 22

Slide 22 text

Guardar estado dos arquivos ao longo da história Manter histórico de mudanças Mostrar diferenças entre dois pontos específicos da história Identificar um ponto específico da história Abrir frentes de trabalho paralelo

Slide 23

Slide 23 text

Slide 24

Slide 24 text

Slide 25

Slide 25 text

Slide 26

Slide 26 text

Slide 27

Slide 27 text

No content

Slide 28

Slide 28 text

http://git-scm.com/

Slide 29

Slide 29 text

Centralizado

Slide 30

Slide 30 text

Distribuído

Slide 31

Slide 31 text

Repositórios remoto remoto local local local

Slide 32

Slide 32 text

DISCLAIMER

Slide 33

Slide 33 text

https://www.flickr.com/photos/n3wjack/1776026641

Slide 34

Slide 34 text

git commit Guardar estado dos arquivos ao longo da história git log Manter histórico de mudanças git diff Mostrar diferenças entre dois pontos específicos da história git tag Identificar um ponto específico da história git branch Abrir frentes de trabalho paralelo

Slide 35

Slide 35 text

commit branch

Slide 36

Slide 36 text

master feature/something

Slide 37

Slide 37 text

master feature/something branch

Slide 38

Slide 38 text

master feature/something branch

Slide 39

Slide 39 text

$ git clone remoto local master

Slide 40

Slide 40 text

$ git clone remoto local master origin

Slide 41

Slide 41 text

$ git clone remoto local master origin/master origin camada de sincronização

Slide 42

Slide 42 text

$ git clone remoto local master origin/master master origin camada de sincronização

Slide 43

Slide 43 text

Clonar um repositório existente Achievement unlocked

Slide 44

Slide 44 text

$ git init remoto local master

Slide 45

Slide 45 text

$ git remote add origin remoto local master origin

Slide 46

Slide 46 text

$ git push origin master remoto local origin/master master origin camada de sincronização

Slide 47

Slide 47 text

$ git push origin master remoto local master origin/master master origin camada de sincronização

Slide 48

Slide 48 text

Compartilhar um novo repositório Achievement unlocked

Slide 49

Slide 49 text

staging repository working dir

Slide 50

Slide 50 text

working dir staging repository $ git status

Slide 51

Slide 51 text

working dir staging repository $ git add

Slide 52

Slide 52 text

working dir staging repository $ git status

Slide 53

Slide 53 text

working dir staging repository $ git commit

Slide 54

Slide 54 text

working dir staging repository $ git status

Slide 55

Slide 55 text

Fazer um commit Achievement unlocked

Slide 56

Slide 56 text

master HEAD

Slide 57

Slide 57 text

feature/something $ git checkout -b feature/something master HEAD

Slide 58

Slide 58 text

$ git commit master feature/something HEAD

Slide 59

Slide 59 text

$ git checkout master master feature/something HEAD

Slide 60

Slide 60 text

$ git commit master feature/something HEAD

Slide 61

Slide 61 text

master $ git merge feature/something HEAD feature/something

Slide 62

Slide 62 text

master $ git branch -d feature/something HEAD

Slide 63

Slide 63 text

Fazer um merge Achievement unlocked

Slide 64

Slide 64 text

master feature/something HEAD

Slide 65

Slide 65 text

master feature/something HEAD $ git rebase master

Slide 66

Slide 66 text

master feature/something HEAD $ git rebase master

Slide 67

Slide 67 text

master feature/something HEAD $ git rebase master

Slide 68

Slide 68 text

master feature/something $ git checkout master HEAD

Slide 69

Slide 69 text

master $ git merge feature/something HEAD feature/something

Slide 70

Slide 70 text

Fazer um rebase Achievement unlocked

Slide 71

Slide 71 text

https://www.flickr.com/photos/dnkemontoh/2680822579

Slide 72

Slide 72 text

COMO COMEÇAR?

Slide 73

Slide 73 text

Crie uma conta https://github.com/ https://bitbucket.org/

Slide 74

Slide 74 text

https://try.github.io

Slide 75

Slide 75 text

http://git-scm.com/book

Slide 76

Slide 76 text

DÚVIDAS?

Slide 77

Slide 77 text

Obrigado! lab.vtex.com

Slide 78

Slide 78 text

Créditos ÍCONES: https://www.iconfinder.com/icons/65930/psd_icon https://www.iconfinder.com/icons/65960/zip_icon http://thenounproject.com/term/document/5718/ http://thenounproject.com/term/document/5713/ http://thenounproject.com/term/document/5715/ http://thenounproject.com/term/cloud/4990/ http://thenounproject.com/term/user/43764/ http://thenounproject.com/term/history/11223/