I've copied code from my IDE to a text editor, threw away my branch, pulled Master, create new branch, then copy code line by line from text editor back to IDE instead of dealing with a gnarly merge conflict before. I call this the "Nuclear Option".
God, I hate this shit. Every feature I work on has me touching nearly the entire codebase. How did I inherit the maintenance of this ball of spaghetti program and how do I un-inherit this?
Do you claim to NOT know why this happened?
NoLifeGamer2 [OP] 198 points · Jun 2022 · :py::j::js:
IDK not my problem I'm resigning later anyway
stilldebugging 68 points · Jun 2022
Wow, that’s an extreme reaction to a bad git merge. Or… is it?
alaskanloops 67 points · Jun 2022
I've copied code from my IDE to a text editor, threw away my branch, pulled Master, create new branch, then copy code line by line from text editor back to IDE instead of dealing with a gnarly merge conflict before. I call this the "Nuclear Option".
[deleted] 32 points · Jun 2022
[deleted]
LiamMeron 15 points · Jun 2022
God, I hate this shit. Every feature I work on has me touching nearly the entire codebase. How did I inherit the maintenance of this ball of spaghetti program and how do I un-inherit this?
danielv123 1 points · Jun 2022
This becomes less of a problem as the project grows in my experience.
LiamMeron 1 points · Jun 2022
This is a legacy application. It's unfortunately already grown into this shape...
danielv123 1 points · Jun 2022
:(
Xanvial 14 points · Jun 2022 · :cp::j::g:
That's just rebase with extra steps
vale_fallacia 1 points · Jun 2022
Ooh-la-la, someone's going to get laid in college.
i_sigh_less 9 points · Jun 2022
That's more or less the same as
isn't it?
normalmighty 11 points · Jun 2022 · :py::cs::js:
It is, but a shocking number of people don't know any git features beyond the basics you use every day.
alaskanloops 1 points · Jun 2022
Yep this was me at the time.
jjbugman2468 4 points · Jun 2022
Yup. Been there, done that. I’d been at the merge conflict for hours and finally decided to do this. Done in less than 30 mins.
MegabyteMessiah 1 points · Jun 2022
Thought I was the only one
casce 8 points · Jun 2022
I can definitely see situations where a bad merge would justify quitting your job.
stilldebugging 3 points · Jun 2022
Yeah, me too. Except that if I changed jobs I’d start with nothing when I ctrl-r. Existential crisis.
dagbrown 3 points · Jun 2022
Wasn't there an enormous outage just last week caused by, essentially, a bad git merge?
_GCastilho_ 2 points · Jun 2022 · :ts::js::rust::j::p::c::ru:
*Vsauce music starts*