Principle developer tip: rewrite history to make yourself seem smarter.
Soft reset the whole branch and commit a series of atomic and semantic patches (eg separating code, test, and refactor changes) that tell a clean narrative of the changeset to reviewers, future blamers.
Senior developer tip: squash the evidence.
Senior developer tip: Squash
the evidencemanagementPrinciple developer tip: rewrite history to make yourself seem smarter.
Soft reset the whole branch and commit a series of atomic and semantic patches (eg separating code, test, and refactor changes) that tell a clean narrative of the changeset to reviewers, future blamers.
And then my team squashes those commits 😩
Do you put effort into your commit messages before the rewrite, or just write something quick for yourself and then put in the effort later?
Depends, but usually I will put in the effort up front and maybe tweak them in an in[eractive rebase, or just manually copy+paste.
If they’re worth saving. Sometimes you have to kill your darlings though
git commit --amend --no-editThis helped me countless times…