Post details
Merge vs. Rebase vs. Squash. Anyone who says "100% of the time you <merge/rebase/squash>" is wrong and I'm strong in that opinion. I'm asked about this pretty regularly, so I decided to take my copy paste answer I always use and put it in a gist. 🍿 https://gist.github.com/mitchellh/319019b1b8aac9110fcfb1862e0c97fb