Rebase and merge are not rival moral systems. They create different commit graphs, and the useful choice depends on who already depends on the history. Choose the shape that makes collaboration, debugging, and recovery boring—not the one that wins an argument in a pull request.
Git Rebase vs. Merge: Choose a History Shape Deliberately
Posted on in Programming
