Commit

Stop using git merge to rebase or fix conflicts 😠 Seriously, stop running git merge main in your branches to “stay up to date”. Your history looks like a bowl of noodles, and deep down you know it.