git in 5 slides - namok.benamok.be/public/documents/5slides/in5slides-git-advanced.pdf · git in 5...
Transcript of git in 5 slides - namok.benamok.be/public/documents/5slides/in5slides-git-advanced.pdf · git in 5...
![Page 1: git in 5 slides - namok.benamok.be/public/documents/5slides/in5slides-git-advanced.pdf · git in 5 slides (advanced) git how to work with branch a branch is parallel development HEB-ÉSI](https://reader034.fdocuments.us/reader034/viewer/2022042606/5f606f4f3441354c3810f79d/html5/thumbnails/1.jpg)
git in 5 slides(advanced)
![Page 2: git in 5 slides - namok.benamok.be/public/documents/5slides/in5slides-git-advanced.pdf · git in 5 slides (advanced) git how to work with branch a branch is parallel development HEB-ÉSI](https://reader034.fdocuments.us/reader034/viewer/2022042606/5f606f4f3441354c3810f79d/html5/thumbnails/2.jpg)
git how to work with branch
a branch is parallel development
HEB-ÉSI · Pierre Bettens (pbt) · 2 / 9
![Page 3: git in 5 slides - namok.benamok.be/public/documents/5slides/in5slides-git-advanced.pdf · git in 5 slides (advanced) git how to work with branch a branch is parallel development HEB-ÉSI](https://reader034.fdocuments.us/reader034/viewer/2022042606/5f606f4f3441354c3810f79d/html5/thumbnails/3.jpg)
basic use
default branch is master
echo "I'm the best" > file
git init
git add .
git commit -m "First commit"
HEB-ÉSI · Pierre Bettens (pbt) · 3 / 9
![Page 4: git in 5 slides - namok.benamok.be/public/documents/5slides/in5slides-git-advanced.pdf · git in 5 slides (advanced) git how to work with branch a branch is parallel development HEB-ÉSI](https://reader034.fdocuments.us/reader034/viewer/2022042606/5f606f4f3441354c3810f79d/html5/thumbnails/4.jpg)
basic use
create other branch called chief
git checkout -b chief
echo "Chief is better than me" > file
git commit -a -m "Chief commit"
git checkout < master | chief >
HEB-ÉSI · Pierre Bettens (pbt) · 4 / 9
![Page 5: git in 5 slides - namok.benamok.be/public/documents/5slides/in5slides-git-advanced.pdf · git in 5 slides (advanced) git how to work with branch a branch is parallel development HEB-ÉSI](https://reader034.fdocuments.us/reader034/viewer/2022042606/5f606f4f3441354c3810f79d/html5/thumbnails/5.jpg)
basic use
merge modifications
git merge <branch>
pull ≠ fetch
= fetch + merge
HEB-ÉSI · Pierre Bettens (pbt) · 5 / 9
![Page 6: git in 5 slides - namok.benamok.be/public/documents/5slides/in5slides-git-advanced.pdf · git in 5 slides (advanced) git how to work with branch a branch is parallel development HEB-ÉSI](https://reader034.fdocuments.us/reader034/viewer/2022042606/5f606f4f3441354c3810f79d/html5/thumbnails/6.jpg)
standard workflow
![Page 7: git in 5 slides - namok.benamok.be/public/documents/5slides/in5slides-git-advanced.pdf · git in 5 slides (advanced) git how to work with branch a branch is parallel development HEB-ÉSI](https://reader034.fdocuments.us/reader034/viewer/2022042606/5f606f4f3441354c3810f79d/html5/thumbnails/7.jpg)
workflow
work on sprint_i+1 … … when sprint_i must be validated
sprint_i is master
git checkout -b sprint_i+1
… // sprint_i validated
git checkout master
git merge sprint_i+1
git branch -d sprint_i+1
![Page 8: git in 5 slides - namok.benamok.be/public/documents/5slides/in5slides-git-advanced.pdf · git in 5 slides (advanced) git how to work with branch a branch is parallel development HEB-ÉSI](https://reader034.fdocuments.us/reader034/viewer/2022042606/5f606f4f3441354c3810f79d/html5/thumbnails/8.jpg)
I fail !
amend when you failchange commit message
git commit --amend
add file with 'git add' and commit
git commit --amend -a
blame show change history for a file and say who fail
![Page 9: git in 5 slides - namok.benamok.be/public/documents/5slides/in5slides-git-advanced.pdf · git in 5 slides (advanced) git how to work with branch a branch is parallel development HEB-ÉSI](https://reader034.fdocuments.us/reader034/viewer/2022042606/5f606f4f3441354c3810f79d/html5/thumbnails/9.jpg)
This slides are part of 5slides serie« 5slides – how to present a concept in 5 slides »
Creditsgitmagic by Ben Lynn fr en
Who am I ?Pierre Bettens (pbt) – http://blog.namok.be
Images and iconsThe noun project; Joe Harrisson, Juan Pablo Bravo, Mert Gutav
DeviantArt; Navanna
Flickr; Richard Cuisset