Scribd
Upload
134 views2 pages

Create On Branch Commit Notes

fsdsdff4

Uploaded by

Youness Bakache
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as PDF, TXT or read online on Scribd
134 views2 pages

Create On Branch Commit Notes

fsdsdff4

Uploaded by

Youness Bakache
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as PDF, TXT or read online on Scribd
You are on page 1/ 2

Version​ ​Control​ ​with​ ​Git

final​ ​project

Create​ ​a​ ​Git​ ​repository​ ​with​ ​the​ ​commits​ ​shown​ ​in​ ​the​ ​commit​ ​graph​ ​and​ ​table​ ​below.​ ​This
simulates​ ​a​ ​team​ ​building​ ​and​ ​releasing​ ​a​ ​product​ ​using​ ​the​ ​Gitflow​ ​workflow.​ ​The​ ​first​ ​release
(v1.00)​ ​has​ ​only​ ​one​ ​feature.​ ​Soon​ ​after​ ​release,​ ​a​ ​bug​ ​was​ ​discovered​ ​and​ ​a​ ​hotfix​ ​(v1.01)​ ​was
necessary.

When​ ​you​ ​are​ ​finished,​ ​find​ ​someone​ ​to​ ​check​ ​your​ ​work.​ ​They​ ​can​ ​clone​ ​your​ ​repository​ ​to
check​ ​it.​ ​Feel​ ​free​ ​to​ ​experiment​ ​and​ ​good​ ​luck!

create
on
commit type fileA.txt​ ​content branch commit​ ​message parents notes
create
A - master add​ ​README.md - README.md
B ""​ ​(empty​ ​string) develop add​ ​fileA.txt A
C "feature​ ​1​ ​wip" feature1 feature​ ​1​ ​wip B
D "feature​ ​1​ ​with​ ​2​ ​bugs" feature1 add​ ​feature​ ​1 C
Merge​ ​branch
merge 'feature1'​ ​into delete​ ​feature1
E commit (no​ ​change) develop develop B,​ ​D label

Copyright​ ​©​ ​2018​ ​Atlassian


"feature​ ​1​ ​with​ ​2​ ​bugs
F feature​ ​2​ ​wip" feature2 feature​ ​2​ ​wip E
G "feature​ ​1​ ​with​ ​1​ ​bug" release1 fix​ ​feature​ ​1​ ​bug​ ​X E
merge results​ ​in Merge​ ​branch
H commit "feature​ ​1​ ​with​ ​1​ ​bug" master 'release1' A,​ ​G tag​ ​"v1.00"
Merge​ ​branch
merge results​ ​in 'release1'​ ​into delete​ ​release1
I commit "feature​ ​1​ ​with​ ​1​ ​bug" develop develop E,​ ​G label
will​ ​need​ ​to
"feature​ ​1​ ​with​ ​1​ ​bug resolve​ ​merge
F1 rebase feature​ ​2​ ​wip" feature2 feature​ ​2​ ​wip I conflict
K "feature​ ​1" hotfix1 fix​ ​feature​ ​1​ ​bug​ ​Y H
merge Merge​ ​branch
L commit "feature​ ​1" master 'hotfix1' H,​ ​K tag​ ​"v1.01"
merge Merge​ ​branch delete​ ​hotfix1
M commit "feature​ ​1" develop 'hotfix1'​ ​into​ ​develop I,​ ​K label
will​ ​need​ ​to
"feature​ ​1 resolve​ ​merge
F2 rebase feature​ ​2​ ​wip" feature2 feature​ ​2​ ​wip M conflict

Copyright​ ​©​ ​2018​ ​Atlassian ​(version​ ​1.1)

You might also like