3 ms·
Any workflow that alters history is dangerous. Just merge things normally, and don't get fancy. If you want to futz with stuff and squash commits and rewrite c
by thrower123 5y ago
Any workflow that alters history is dangerous. Just merge things normally, and don't get fancy.
If you want to futz with stuff and squash commits and rewrite commit messages because you didn't write good ones on a feature branch, fine, whatever makes you happy.
But just merge to master, don't rebase.
- cube00 5y agoThe downside if you don't rebase your branch is you end up with a merge commit with two parents with independent commits on both sides which makes bisecting more of a challenge then if you had a linear rebased history.