Git workflow advanced - Trung tâm lập trình Codeto Vietnam

Workflow and Advanced Tips

CODETO@2015/11/09

GIT OVERVIEWWORKFLOWBENGO4 WORKINGADVANCED TIPS

Trung tâm lập trình CODETO@2015/11/09

GIT






DEVELOPMENT

o Reflects the latest development

TESTING/STAGING

o Code is deployed to testing/staging environment

MASTER

o Code is deployed to production




















BENGO4 (in practice)


BENGO4 (in practice)


ADVANCED TIPS

Merge vs Rebase

Reset/Checkout/Revert

Git Log


ADVANCED TIPS

Merge vs Rebase

Reset/Checkout/Revert

Git Log

Merge vs Rebase

Merge• git checkout feature • git merge master


Merge vs Rebase

Rebase• git checkout feature • git rebase master


Merge vs Rebase

MergeEasy & SimpleNew merge-commitMess history

RebaseDangerous & FlexibleMove all commits to HEADNatural history

Dangerous rebase• Never rebase on master branch• About to re-base a public branch (pushed)? Anyone are working on?• Don’t sure – don’t use

Reset/Checkout/RevertReset• Remove commits in current branch• Move HEAD to PREVIOUS commits in local repo


Reset/Checkout/RevertReset• Soft• Mixed• Hard


Reset/Checkout/RevertCheckout• Switch branches• Bring changes from another branch• Back to previous commit


Reset/Checkout/RevertRevert• Safe way to undo changes• Create new commits for roll-back commits


Git loggit log (useful in command line)• --oneline (display in single line)• --decorate (display in branches point to each commit)• shortlog (display short,readable commits group by author)• --graph --oneline –decorate (draw graph in cli)• --pretty=format:"%cn committed %h on %cd“ (custom log format)• -<number> (most recent commits)• --after="2014-7-1“--before="2014-7-4“ (after and before)• --author="John“ (filter by author)• -- <file>• --<branch a>..<branch b>• …


SUMMARY

Great workflow and collaboration!

Powerful branching & merging

Fast and smaller than ever before ..

Local repo - network out, everything still fine…


Engineering

Git workflow advanced - Trung tâm lập trình Codeto Vietnam