Whether you’re steering an open source project or leading full-time a software development team, the key to maximizing productivity lies in efficient code reviews.
Whether you’re steering an open source project or leading full-time a software development team, the key to maximizing productivity lies in efficient code reviews.
You can add branch protections that will prevent you from accidental force pushing to
main
ordev
.IMO when I see a PR with “WIP” commits, I just assume that minimal effort was put into keeping the commits organized, and I squash all commits to review the PR. If I see many meaningful commit messages, I will try reviewing one commit at a time.
When I make a PR, I force push to keep my commits organized. If there are changes I want to make as a result of feedback, and they would create significant churn to rebase all of the patches, then I will apply the feedback in a follow-up commit.
I do almost exactly that workflow as well, but I just know its bitten me before. Protecting main/dev is fine, but I have also accidentally force pushed to the wrong branch and wiped out its work as well.
Muscle memory + Fatigue == Bad time :/
Pays to know how to recover code from the reflog in these cases.
Yeah, or sprint to your colleague and ask them to force push their branch again :D
Another tactic for for getting clean git commits is to do all your messy commit work in a scratch branch, and then when your happy, create a new branch, and with meld, organise your changes into complete logical commits. We do that a little bit.
At first I read that as re-flog. Is that with a cat o’ nine tails? 😂
Your Git requires a regular flagellation to function properly.