15
Git From init to branches

Git - Workshop Disruptiva

Embed Size (px)

Citation preview

Git

From init to branches

Bruno Almeidawho is this guy?

Hometown @ Lages, Santa Catarina

Fullstack Ruby Engineer @ Resultados Digitais

Passionate Developer @ GoforGood

@wwwbruno

Git, Rails, Docker and Open Source lover <3

Mindset

What is Git?

What about other VCS?

GitFrom init to branches

terminal vs gui

init, add, commit and push

pull vs fetch && rebase

branch develop

branch many features

pull request

pro tips

$ terminal vs gui

$ init, add, commit and push

● git init● git add● git commit -m “Add initial files”● git push -u origin master

$ pull vs fetch && rebase

Pull

● does a fetch and merge● all commits in the end

Fetch && rebase

● all commits in order

$ brach develop

● git fetch origin develop● git checkout develop● git add .● git commit● git push origin develop

$ brach many features

● pattern● name with meaning● unique

vortex-kpi-first-form-integration-conversion

vortex-bugfix-api-accept-datetime-object

$ pull request

● what is it?● what did you do?● who to test?● observations● code review and discuss!

$ pro tips

● git diff● git add -p● git commit --amend● git reset --hard HEAD● git config alias.st status

Thank you

terminal vs gui

init, add, commit and push

pull vs fetch && rebase

branch develop

branch many features

pull request

pro tips

Questions? See you @ Github