ancaprevolt on Nostr: Are you squashing commits? I made 10 commits today and 5 are merge commits, but on my ...

Are you squashing commits? I made 10 commits today and 5 are merge commits, but on my machine I actually made like 25 commits to save my progress and I combined them by squashing.

I have an alias "qc" to commit with safety checks, without pushing, so I just spam that like every 20 minutes at least if I'm in the middle of a big change, then I use my "sq" alias to rebase interactively against the next / dev branch, then I use "ps" to push it smartly. Or if I squashed commits I already pushed, I run `git push --force-with-lease origin <branch>` to fix the problems from deleting and adding a commit without risking overwriting someone's changes (even though I'm developing alone)

I only made 5 actual commits that are changes today, but each is a group of 2-6 smaller commits that I combined after. I could have squashed one more to make it 4...

My commit rate was so high before because I didn't know to combine commits, but I was still committing often like you should in case something goes wrong