has been using git nearly daily for a decade : its shit software. a fucking embarrassment and a daily bullet to stick in your foot
currently stuck in a rebase with 50 commits on either side . what now. delete the directory and try again? manually merge every commit on the mastodon main branch?
its not even my repo why the fuck am i being asked to merge things. just fucking rebase it useless piece of shit software
🦆 🦆 ​ git rebase non interactive
all results : non interactive interactive rebase
are you fucking joking. no i am the joker. i am pulling a big joke on programmers by having to do a thing
i am having merge conflicts with files that i have never touched. so its conflicting with its own source of truth. because the rebase is Broken because git is a worthless piece of shit
JUST DO LIKE THE SOURCE REPO I AM GOING TO FUCKING LOSE IT
"remove all conflicts manually"
oh i dont know how should i know am i a git repository reading software??? am i the git command line program??? am i eugen mastodon??? am i omniscient?? READ THE FUCKING REPO AHHHHHH
initial requirement : add a few files to the mastodon repository, track updates
git result : i have fucked three load bearing ruby files that you have never intended to change. good luck
git solution : turn your 10 lines bash script into a 25 lines bash script. does it work? try 50
what hubris to think of relying on a tool to apply patch files instead of applying patch files myself assuming the tool will murder me at the first opportuinity . thank you linus for this valuable lesson. fuck you
@CobaltVelvet i like It when the easiest git solution is fucking copying and pasting lines of code from one branch to another by hand