3 ms·
You could also frequently merge master into your branch and squash at the end.
by domano 5y ago
You could also frequently merge master into your branch and squash at the end.
- ivanche 5y agoBut squashing changes chronological view, right? Either you want "real" history or not. If you're already willing to do that then with the same amount of work you get cleaner history with rebasing, i.e. no intertwined branches.