Using git for version control allows for powerful collaboration in tech teams. Like any tool, if misused, it can also cause some serious headaches. After working with a wide variety of team sizes and dynamics, I’ve found that the
squash and rebase workflow helps make the collaboration process more efficient and a hell of a lot less painful.
What is the squash rebase workflow?
It’s simple – before you merge a feature branch back into your main branch (often
develop), your feature branch should be squashed down to a single buildable commit, and then rebased from the up-to-date main branch. Here’s a breakdown.