Rebase vs. Merge: Pros and cons

A simple explanation of how merge and rebase work along with some use cases to help you choose the best approach.
Bors-NG is a GitHub app that prevents merge skew: A problem where patches work at review time but don’t work when they’re actually merged because the main branch changed in the meantime. The classic example is when one patch renames a…