Loading…
3
My first git merge took 6 hours because of a missing comma
Honestly I thought I was done with my first group project in like 2 hours. Then we tried to merge our branches and everything broke. Took me 4 hours just to figure out that one missing comma in a JSON file caused the whole thing to fail. Then another 2 hours fixing the merge conflicts that piled up because we all edited the same lines. Ngl I almost deleted the whole repo out of frustration. Has anyone else had a simple typo wreck an entire day for them?
2 comments
Log in to join the discussion
Log In2 Comments
christopherw341mo ago
Wait, it took your buddy a whole Friday night just for one missing comma in a config file? That's insane, but honestly I'm not surprised because those tiny errors hide so well. The worst part is when everyone's already touched the same lines, so the merge conflicts multiply like crazy and you're just stuck staring at the screen wondering if you even know how to code anymore. Good to know we're all in the same boat, hanging onto that one nightmare merge story forever.
6
aaron7401mo ago
Heard this exact thing happen to my buddy last semester, his team spent a whole Friday night chasing a typo in a config file and the merge only worked once they found it. Same thing, everyone had touched the same function so the conflicts were a nightmare to sort through. He still brings it up whenever someone mentions git, so at least you know you're not alone in this.
1