Sometimes I look at the memes around here and wonder wtf y’all are doing. Like, neither my code nor the code at the place I work at are perfect. But I don’t think I’ve ever seen a merge do this. Maybe some of the most diverged merges temporarily had a lot of errors because of some refactoring, but then it was just a few find + replaces away from being fixed again. But those were merges where multiple teams had been working on both the original and the fork for years and even then it was usually pretty okay.
It’s really easy to make a gigantic mess using git if you don’t know what you’re doing. As soon as you learn to keep your history mostly linear all those issues go away.
CS students
This is true. I got really good at fixing merge conflicts in college
You kinda have to when half of your “team” is barely even able to write code.
I know this is a joke, but those errors/warnings/messages screenshot is not from git. That looks more like results from a compiler of some sort.
Looks exactly like Visual Studio 2022.
I guess the joke implies that automated (or incorrect manual) conflict resolution causes code that doesn’t compile. But still not git’s fault. They should probably have merged earlier and in rare cases where that wasn’t possible, you have to bite the bullet and fix this stuff.
You need to merge more often.
Rebase. That’s where the real trauma is.
And the branch should be alive a shorter period
Neither rebasing nor merging should cause trauma if everyone on the team takes a day or two to understand git
You and I have very different opinions on what is a reasonable expectation for our respective teams.
You think it’s unreasonable for a software developer to take one to two days to learn a tool that’s basically ubiquitous in their field?
No, I think it’s a perfectly reasonable thing to do, my coworkers on the other hand…
I suck at git.
I’m currently rebasing 17k commits into my branch. I’m letting it run overnight.I’m disgusting.
If I saw this in my code… I’d just… I’d have a mental breakdown
