Fix Common Git Mistakes by Chris Achard
▶️ Session Recording Recording (13/9/2019)
Why is this topic important for somebody to learn?
Programmers use git all day, everyday, but it's still common to get stuck into situations and have no idea how to get out without a lot of hassle. When you really know the git workflow well, it can speed up development, and reduce the hassle of getting stuck in a bad state.
What should the learner be able to do at the end of the course?
Use git confidently! Or at least: recognize when they're in a situation that they can get out of gracefully.
What are the milestones that a student will reach as they work toward the big picture goal of this workshop?
- Understand how files are stored, cached, and pushed
- How to do and undo "add", "stash", "commit", "push"
- What to do when there are conflicts in merges
- How to switch branches gracefully
- Know what operations are destructive, and know how to not lose a bunch of work
- Handle gitignore properly, including ignoring files you've already commited
- Understand what origin is, and how to handle complicated server situations
- Merge vs rebase (and other workflow considerations)
What will your example or demo be for this workshop?
I imagine it would be like a "cookbook" workshop, or a bunch of mini-lessons. "Here's how you could mess it up; now here's how to fix it". Perhaps there would also need to be an intro part to explain the git file/branch model as well, just so everyone is on the same page