#3 - Git - Branching e Merging

1.
Rodrigo Branas –@rodrigobranas - http://www.agilecode.com.br #3 - Git - Branching e Merging

2.
Rodrigo Branas rodrigo.branas@agilecode.com.br http://www.agilecode.com.br • Arquitetode Software na Gennera • Professor na Agile Code • Autor na Java Magazine e PacktPub • Palestrante

3.
http://www.youtube.com/rodrigobranas

4.
O que éum branch e quais são as vantagens de utilizá-lo?

5.
Um branch éuma nova linha de desenvolvimento que permite isolar o código de uma nova funcionalidade, mantendo a linha base estável.

6.
É possível trocarde branch facilmente, a qualquer momento

7.
Os commits podemcontinuar contando a história do projeto

8.
O branch podeser sincronizado e compartilhado, evitando perdas

9.
Depois de trabalharno branch é necessário realizar um merge

10.
git branch

12.
commit a9ae tree f4b3 parent master

13.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae master

14.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d master

15.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master

16.
git branch feature1

18.
git branch

20.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master

21.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature1

22.
No Git, umbranch é apenas uma referência para um commit.

23.
cat .git/refs/heads/master cat .git/refs/heads/feature1

25.
git log --oneline--decorate

27.
HEAD?

28.
cat .git/HEAD

30.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature1

31.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature1HEAD

32.
git checkout feature1

34.
cat .git/HEAD

36.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature1HEAD

37.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature1 HEAD

38.
Criando um commitno branch...

39.
echo d >d.txt git add -A git commit -m "d.txt"

41.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature1 HEAD commit a42c tree ad86 parent b274

42.

44.
Trocando de branch,os arquivos são substituídos

45.
git checkout master ls-la

47.

49.
git log --oneline--decorate --all

51.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature1 HEAD commit a42c tree ad86 parent b274

52.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature1 commit a42c tree ad86 parent b274 HEAD

53.
Realizando um mergeno master...

54.
git merge feature1

56.

57.

58.
Fast-Forward

59.
A estratégia fast-forwardé apenas uma atualização da referência e só é possível quando não existe divergência entre os branches.

60.

62.
git branch -dfeature1

64.

66.

67.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master commit a42c tree ad86 parent b274 HEAD

68.
Criando uma divergênciaentre o master e o branch...

69.
git branch feature2 gitcheckout feature2 ou git checkout -b feature2

71.
commit a9ae tree f4b3 parent commit372d tree d11b parent a9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master commit a42c tree ad86 parent b274 HEAD

72.

73.
echo e >e.txt git add -A git commit -m "e.txt"

75.

77.

78.
commit 372d tree d11b parenta9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature2 commit a42c tree ad86 parent b274 HEAD

79.
commit 372d tree d11b parenta9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature2 commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD

80.
git checkout master

82.

83.

84.

85.
echo f >f.txt git add -A git commit -m "f.txt"

87.

88.
commit 372d tree d11b parenta9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature2 commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD commit d67a tree 10e6 parent a42c

89.

91.
git log --oneline--decorate --all --graph

93.
Realizando um merge...

94.
git merge feature2

98.
commit 372d tree d11b parenta9ae commit 7f64 tree 6300 parent 372d commit b274 tree 15eb parent 7f64 master feature2 commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD commit d67a tree 10e6 parent a42c

99.
commit 7f64 tree 6300 parent372d commit b274 tree 15eb parent 7f64 master feature2 commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD commit d67a tree 10e6 parent a42c

100.
commit 7f64 tree 6300 parent372d commit b274 tree 15eb parent 7f64 master feature2 commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2

101.
Recursive

102.
A estratégia recursiveé utilizada quando existe divergência entre os branches e um commit para unir ambos se torna necessário.

103.

105.

107.
commit 7f64 tree 6300 parent372d commit b274 tree 15eb parent 7f64 master feature2 commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2

108.
commit 7f64 tree 6300 parent372d commit b274 tree 15eb parent 7f64 master commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2

109.
E se derconflito?

110.
git checkout -bfeature3

112.
commit 7f64 tree 6300 parent372d commit b274 tree 15eb parent 7f64 master commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2

113.
commit 7f64 tree 6300 parent372d commit b274 tree 15eb parent 7f64 master commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 feature3

114.
echo g2 >g.txt git add -A git commit -m "g.txt"

116.
commit b274 tree 15eb parent7f64 master commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 feature3

117.
commit b274 tree 15eb parent7f64 master commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 feature3 commit c5b5 tree 82b4 parent cc8a

118.

120.
git checkout master

122.
commit b274 tree 15eb parent7f64 master commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c HEAD commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 feature3 commit c5b5 tree 82b4 parent cc8a

123.
commit b274 tree 15eb parent7f64 master commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 feature3 commit c5b5 tree 82b4 parent cc8a HEAD

124.
echo g1 >g.txt git add -A git commit -m "g.txt"

126.
commit b274 tree 15eb parent7f64 master commit a42c tree ad86 parent b274 commit fde2 tree a025 parent a42c commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 feature3 commit c5b5 tree 82b4 parent cc8a HEAD

127.
master commit a42c tree ad86 parentb274 commit fde2 tree a025 parent a42c commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 feature3 commit c5b5 tree 82b4 parent cc8a HEAD

128.
master commit a42c tree ad86 parentb274 commit fde2 tree a025 parent a42c commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 feature3 commit c5b5 tree 82b4 parent cc8a HEAD commit c85e tree a1bb parent cc8a

129.
git merge feature3

131.
git status

133.
git diff

135.
vi g.txt

139.
git add -A gitcommit -m "g.txt"

141.
master commit a42c tree ad86 parentb274 commit fde2 tree a025 parent a42c commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 feature3 commit c5b5 tree 82b4 parent cc8a HEAD commit c85e tree a1bb parent cc8a

142.
master commit a42c tree ad86 parentb274 commit fde2 tree a025 parent a42c commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 feature3 commit c5b5 tree 82b4 parent cc8a HEAD commit c85e tree a1bb parent cc8a commit 270e tree 82b4 parent c85e parent c5b5

143.

145.

147.
master commit a42c tree ad86 parentb274 commit fde2 tree a025 parent a42c commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 feature3 commit c5b5 tree 82b4 parent cc8a HEAD commit c85e tree a1bb parent cc8a commit 270e tree 82b4 parent c85e parent c5b5

148.
master commit a42c tree ad86 parentb274 commit fde2 tree a025 parent a42c commit d67a tree 10e6 parent a42c commit cc8a tree 10e6 parent d67a parent fde2 commit c5b5 tree 82b4 parent cc8a HEAD commit c85e tree a1bb parent cc8a commit 270e tree 82b4 parent c85e parent c5b5

149.
Rodrigo Branas Site: http://www.agilecode.com.br Twitter:@rodrigobranas Facebook: http://www.facebook.com/canalrodrigobranas SlideShare: http://www.slideshare.com/rodrigobranas YouTube: http://www.youtube.com/rodrigobranas LinkedIn: http://br.linkedin.com/in/rodrigobranas +Plus: https://plus.google.com/+RodrigoBranas GitHub: http://www.github.com/rodrigobranas

#3 - Git - Branching e Merging

More Related Content

What's hot

Similar to #3 - Git - Branching e Merging

More from Rodrigo Branas

Recently uploaded

#3 - Git - Branching e Merging