You are viewing a single thread.
View all comments View context
85 points

Senior developer tip: squash the evidence.

permalink
report
parent
reply
28 points

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.

permalink
report
parent
reply
3 points

And then my team squashes those commits 😩

permalink
report
parent
reply
1 point

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

permalink
report
parent
reply
2 points
Deleted by creator
permalink
report
parent
reply
2 points

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?

permalink
report
parent
reply
2 points

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

permalink
report
parent
reply
10 points

git commit --amend --no-edit

This helped me countless times…

permalink
report
parent
reply
6 points

Senior developer tip: Squash the evidence management

permalink
report
parent
reply

Programmer Humor

!programmer_humor@programming.dev

Create post

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

  • Keep content in english
  • No advertisements
  • Posts must be related to programming or programmer topics

Community stats

  • 9.5K

    Monthly active users

  • 861

    Posts

  • 33K

    Comments