Understanding Github PR Merge Options (1up-ing your git skills part 2)
Channel: Ben Limmer
Date: 2017-09-04

In this talk, Ben Limmer helps to improve your understanding of common git and github concepts. Topics of discussion include:
- the two schools of thought surrounding history in github
- the three options for integrating GitHub PRs (create a merge commit, squash and merge, rebase and merge)
- some gotchas with rewriting history in git, and how to avoid and correct issues
- helpful git commands (add by patch, git revert and git bisect)

A talk for the Ibotta Technology Lunch and Learn Series in August 2017.