Comrade ☭ HoundDon’t git rebase and squash — branch, reset, and commit!Not uncommonly a developer finds themselves in the situation where the mainline has been updated, and they need to merge their changes…2 min read·Oct 26, 2020----