Some Practical Thoughts on Git Merges vs. Rebase
Git rebases are not as complicated as you think. At some point in their careers, most engineers have been been told that they are risking rewriting history but that just isn’t strictly true. The Engineering team at ShopKeep has had this conversation a few times, so we thought we’d share our views on the issue with a wider audience.
Details