Even seasoned developers get in trouble with Git, and fixing a botched branch/PR seems to require a deep understanding of Git's numerous concepts—a lot of theory just to get things done. This talk (originally presented at RubyConf Brazil 2016, then at Shopify) re-introduces Git (and GitHub) from the point of view of a pull request, going through tricky spots that show up time and time again, focusing on what we should know in order to avoid those problems—or at least to control the damage.