AN opinion
on git workflow
- Try out new things
- Go back
Why Git?
- Understand changes
- Find bugs
MANAGE CHANGES
TRACK HISTORY
HISTORY NEEDS
TO BE READABLE!
Why Git?
- ACHIEVE A SINGLE GOAL
- MERGE ONCE DONE
FEATURE BRANCHES
(1) NO-FF MERGE
- VISUALLY PROMINENT
- KEEP BRANCH INFO
- THIS IS INEVITABLE
- WE CAN MINIMIZE IT
(2) REBASE (where possible)
- REBASE ON PARENT
- KEEPS HISTORY LINEAR!
(2) REBASE (where possible)
