Explore the intricacies of Git version control in this JSConf Budapest 2019 conference talk. Delve into Git's internal structure, learning about block objects, commit objects, and branching. Master essential commands like git log, cherry-picking, and git status. Gain confidence in resolving conflicts, understanding commit markers, and performing git resets and merges. Discover a current workflow for efficient Git usage, with a focus on merging in React projects. By the end of this talk, transform your perception of Git from a daunting "dinosaur" to a powerful ally in your development process.
Overview
Syllabus
Intro
What is Git
Git Repository
Terminology
Head
Git Internals
Block Object
Commit Object
Branching
Running Git Log
Cherrypicking
Dont Panic
Git Status
Resolve Conflicts
Read Commit Markers
Git Reset
Merge
Current Workflow
Git Merge React
Commit It Points
Conclusion
Taught by
JSConf
