Git Advanced Techniques

This was presented by Christof Wollenhaupt at Virtual Fox Fest 2025 (May): https://virtualfoxfest.com/

Randall Munroe, the creator of the popular xkcd webcomic, said about Git: “If you get errors, save your work elsewhere, delete the project and download a fresh copy”. This captures the feeling of many developers around the world once they run into a problem with Git. Obviously, he made it part of a comic that is many times funnier than my partial quote.

With the help of many sessions at SWFox and VFF and tools on VFPX you are happily using Git… most of the time. Sometimes things stop working and won't tell you why. Sometimes you wonder if stashing, rebasing and cherry picking is something you need to know or can safely ignore. How to deal with a detached head and what's that anyway? What happens if you delete a branch or a tag?

This session talks about how history works in Git, why and how to rewrite it, how to deal with complex branching scenarios, solve conflicts and avoid them in the first place. We look into the engine room to understand the structure of a Git repository and the secret commands you only discover when you are already in trouble. We also look into typical problems with syncing your repository to one or multiple remote. (As a bonus, we will discuss why a Git repository isn't a backup.)

Видео Git Advanced Techniques канала Geek Gatherings