ever have a merge conflict so bad that you just `rm -rf ./`?

me too

software engineer @ shadow. prev chainalysis, transpose (acq). lover of otters, open-source software, and decentralization. evm ninja

also been known to create a branchname-2 and manually apply each commit when the rebase is just too much

decentralist, turtle stacker, /livecoding cycle carpenter -- building /tofui

Founding Engineer shadow.xyz | Values-Aligned Communities | citizen of Black Rock City

yeah, often i think i want to keep reference to the clean commits i have for insight later. but that of course is never useful lol

I always squash them all into 1 commit and then only have to deal with merge conflicts once