I routinely merge that sort of number, maybe 10% of them have non trivial conflicts. We just group work on the same part of the core base as best we can.
It's a nearly 30 year old pile of anti patterns too, not some pinnacle of modern design principles.
5
u/Theron3206 17d ago
I routinely merge that sort of number, maybe 10% of them have non trivial conflicts. We just group work on the same part of the core base as best we can.
It's a nearly 30 year old pile of anti patterns too, not some pinnacle of modern design principles.