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.

[–] JackbyDev 3 points 5 months ago (1 children)

And then my team squashes those commits 😩

[–] [email protected] 1 points 5 months ago

Yeah it sucks. If the commits are really helpful, you can just paste the git log into the PR/MR/CR body after it's been merged

[–] [email protected] 2 points 5 months ago (1 children)

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?

[–] [email protected] 2 points 5 months ago

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

[–] [email protected] 10 points 5 months ago

git commit --amend --no-edit

This helped me countless times...

[–] SatouKazuma 6 points 5 months ago

Senior developer tip: Squash ~~the evidence~~ management