178
For reference, yes, the screenshot is real, it's from here: https://github.com/TrinityCore/TrinityCore/tree/3.3.5
When your branch becomes a fork
Is that even a joke or a fact statement at this point?
Not familiar enough with this particular project to know, but a quick glance at the commit log shows some overlap in commit authors, so I guess there is at least some level of sharing happening, probably just not through merges.
But being familiar with this kind of project in general, the branches will probably never be fully merged even in the future, just doesn't make much sense because they are server software targeting very different versions of a game client. There are also two other branches, but they "only" diverged by like one or two thousand commits so far.
Average pull request
Well, at least they committed to it!
What is a "merge"?
Oh baby rebase me Rebase me No mohr.
I have no idea how your brain did the gymnastics to get to that, but I'm a fan nonetheless.
What is noun?
Oh baby (don't) verb me
(Don't) verb me
No mohr.
At what point have you just forked yourself in the same repo?
Edit: actually that's basically what it is
At the moment, TrinityCore supports 3 main branches:
3.3.5 targeting original 2010 wow 3.3.5a, you need wow 3.3.5a.12340 client for it to run, wotlk 3.4 client is incompatible. best for starters
cata_classic targeting 2024 wow 4.4 retail cata classic, you need wow 4.4.x client for it to run, cata 4.3.4 client is incompatible. very beta
master usually targeting current retail version. a lot of missing content
I wonder how many merge conflicts there will be.
master? tut, tut, tut
this post was submitted on 05 Jun 2025
178 points (100.0% liked)
Programmer Humor
37174 readers
91 users here now
Post funny things about programming here! (Or just rant about your favourite programming language.)
Rules:
- Posts must be relevant to programming, programmers, or computer science.
- No NSFW content.
- Jokes must be in good taste. No hate speech, bigotry, etc.
founded 5 years ago
MODERATORS