Git Workflows
61
-
Upload
gilvan-ritter -
Category
Software
-
view
93 -
download
0
Transcript of Git Workflows
WE ARE POSSIBLE
MORE THAN 1,300 PEOPLE IN 19 OFFICES.
WPP’S LARGEST DIGITAL AGENCY.
3
A B O U T U S
O U R C L I E N T S
4
GIT WORKFLOWSgi lvan.r i t ter@possib le.com
01 What is git?
02 Git Basics
03 Git Workflows
04 Final Notes
TALK
6
WHAT IS GIT?
8
WHAT IS G IT
GIT BASICS…
10
commit
GIT BASICS . .
11
remote
GIT BASICS . .
12
fetch
GIT BASICS . .
13
pul l
GIT BASICS . .
14
push
GIT BASICS . .
15
branch
GIT BASICS . .
16
tag
GIT BASICS . .
GIT WORKFLOWS
18
central ized
GIT WORKFLOWS / CENTRAL IZED
19
Someone in i t ia l izes the central repositor y
GIT WORKFLOWS / CENTRAL IZED
20
Ever ybody clones the central repositor y
GIT WORKFLOWS / CENTRAL IZED
21
João wor ks on h is feature
GIT WORKFLOWS / CENTRAL IZED
22
Maria wor ks on her feature
GIT WORKFLOWS / CENTRAL IZED
23
João publ ishes h is feature
GIT WORKFLOWS / CENTRAL IZED
24
Maria t r ies to publ ish her feature
GIT WORKFLOWS / CENTRAL IZED
25
Maria rebases on top of John’s commit(s)
GIT WORKFLOWS / CENTRAL IZED
26
Maria rebases on top of John’s commit(s)
GIT WORKFLOWS / CENTRAL IZED
27
Maria resolves a merge conf l ict
GIT WORKFLOWS / CENTRAL IZED
28
Maria resolves a merge conf l ict
GIT WORKFLOWS / CENTRAL IZED
29
Maria successful l y publ ishes her feature
GIT WORKFLOWS / CENTRAL IZED
30
feature branch
GIT WORKFLOWS / FEATURE BRANCH
31
Maria begins a new feature
GIT WORKFLOWS / FEATURE BRANCH
32
Maria goes to lunch
GIT WORKFLOWS / FEATURE BRANCH
33
Maria f in ishes her feature
GIT WORKFLOWS / FEATURE BRANCH
34
Bi l l receives the pul l request
GIT WORKFLOWS / FEATURE BRANCH
35
Maria makes the changes
GIT WORKFLOWS / FEATURE BRANCH
36
Maria publ ishes her feature
GIT WORKFLOWS / FEATURE BRANCH
37
Meanwhi le , João is doing the exact same thing
GIT WORKFLOWS / FEATURE BRANCH
38
git f low
GIT WORKFLOWS / G ITFLOW
39
Git f low Over view
GIT WORKFLOWS / G ITFLOW
40
Histor ical Branches
GIT WORKFLOWS / G ITFLOW
41
Feature Branches
GIT WORKFLOWS / G ITFLOW
42
Release Branches
GIT WORKFLOWS / G ITFLOW
43
Maintenance Branches
GIT WORKFLOWS / G ITFLOW
44
Create a develop branch
GIT WORKFLOWS / G ITFLOW
45
Maria and João begin new features
GIT WORKFLOWS / G ITFLOW
46
Maria f in ishes her feature
GIT WORKFLOWS / G ITFLOW
47
Maria begins to prepare a re lease
GIT WORKFLOWS / G ITFLOW
48
Maria f in ishes the re lease
GIT WORKFLOWS / G ITFLOW
49
End-user d iscovers a bug and i t gets f ixed in the master branch
GIT WORKFLOWS / G ITFLOW
50
for king
GIT WORKFLOWS / FORKING
51
For king Over view
GIT WORKFLOWS / FORKING
52
The project maintainer in i t ia l izes the of f ic ia l repositor y
GIT WORKFLOWS / FORKING
53
Developers for k the of f ic ia l repositor y
GIT WORKFLOWS / FORKING
54
Developers clone their for ked repositor ies
GIT WORKFLOWS / FORKING
55
Developers wor k on their features
GIT WORKFLOWS / FORKING
56
Developers publ ish their features
GIT WORKFLOWS / FORKING
57
The project maintainer integrates their features
GIT WORKFLOWS / FORKING
58
Developers synchronize with the of f ic ia l repositor y
GIT WORKFLOWS / FORKING
WHICH ONE SHOULD I USE?
References Syncing
https://www.atlassian.com/git/tutorials/syncing
Using Branches
https://www.atlassian.com/git/tutorials/using-branches
Comparing Workflows
https://www.atlassian.com/git/tutorials/comparing-workflows
