You're viewing a single thread.
oh god, it's me103 1 ReplySenior developer tip: squash the evidence.
85 0 ReplyPrinciple 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.
28 0 ReplyAnd then my team squashes those commits 😩
3 0 ReplyYeah 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
1 0 Reply
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?
2 0 ReplyDepends, 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
2 0 Reply
Fix the problems, delete the git folder, git init, git add -A ., git commit -am "project looks good", git push.
2 0 Reply
git commit --amend --no-edit
This helped me countless times...
10 0 ReplySenior developer tip: Squash
the evidencemanagement6 0 Reply
F
13 0 Replygit reset head~9 git add -A git commit -am 'Rebased lol' git push -f
9 0 ReplyF
7 0 Reply🫂
2 0 Reply