Git: From Zero to Hero
Mastering Git workflow
By: @d4vsanchez
Git
Pronounced /git/
Version
Control
System
Nightmares!
Bliss Dreams!
Git
Mercurial
GNU Bazaar
Subversion
CVS
You may not know Git
Why?
- Meaningless commits
- Broken commits
- Unnecessary merges (GOTO 1)
- Manual bug seeking
- Selfish commit messages
- Loose control of history
Let's fix that!
First
Things
First
Working Directory
Staging Area
Repository
RAM
RAM
Disk
Stage
Commit
Your Computer / Local / 💻
Local Repository
Disk
Internet / Remote / ✨
Server
Remote Repository
Push
Branches / 🌿
Show me the code tips
Push only meaningful commits
Sources
What's a Meaningful Commit?
- Separates subject vs body
- Keep the subject succinct
- Have consistent format
- Meaningful commit comes from meaningful changes
Subject vs Body
<type>[optional scope]: short summary
[optional body]Word wrap:
50/72 Rule
Subject line: 50 columns
Body line: 72 columns
Example
Source Control Tells a Story
Git Rebase to the rescue
Git Bisect to find bugs
Git Reflog to save our jobs
Conclusions
Source Control is for humans!
Describe why, not what.
Git has a lot of useful tools that we overlook
Git does forgive, but Git doesn't forget.
In case of emergency, use Git Reflog.
Thanks!
