undefined | Better HN

0 pointsninkendo4y ago0 comments

My problem with rebasing is that the vast majority of my commits are garbage "WIP" commits, and I want to squash them away anyway.

Squash-rebasing on top of main makes git replay all of those dumb commits, just to squash them, and I have to fix merge conflicts individually, for every commit I don't even care about, before it's done.

I'd much rather soft-reset to the merge-base, make one clean commit, then rebase that one commit, than any of the other approaches.

The typical response people have is that I shouldn't create so many garbage WIP commits, but... that's just not how my brain works. See https://news.ycombinator.com/item?id=30000320

0 comments

cerved4y ago

I do to sometimes but I find it to be a poor habit and something I try and avoid or rebase away

j / k navigate · click thread line to collapse

0 pointsninkendo4y ago0 comments

My problem with rebasing is that the vast majority of my commits are garbage "WIP" commits, and I want to squash them away anyway.

I'd much rather soft-reset to the merge-base, make one clean commit, then rebase that one commit, than any of the other approaches.

The typical response people have is that I shouldn't create so many garbage WIP commits, but... that's just not how my brain works. See https://news.ycombinator.com/item?id=30000320