mikey-k

yes - monorepo. Git (and associated service providers) have a lot of work to do to scale out to large organizations working in a single code base.

"Better Merge Conflicts" is not on this list.

Although I'm sympathetic to the problem, and I've personally worked on "Merge Conflicts at Scale". Some of what's being suggested here is interesting. I question if it makes a material difference in the "age of ai", where an AI can probably go figure out enough context to "figure things out".

Interesting idea. While conflicts can be improved, I personally don't see it as a critical challenge with VCS.

What I do think is the critical challenge (particularly with Git) is scalability.

Size of repository & rate of change of repositories are starting to push limits of git, and I think this needs revisited across the server, client & wire protocols.

What exactly, I don't know. :). But I do know that in my current role (mid-size well-known tech company) is hitting these limits today.

Would love it if you can share rates & how much time you spend on billable hours vs how much time you spend managing your practice & hustling. Also, if you're specialized in any niche areas?

I'm in early stages of exploring a similar thing. I'm willing to take a pay-cut for increased flexibility and time off. I've got a stupid-high big-tech comp package at this point, so I'm expecting pay cut to be significant. I'm just not sure how significant. I'm also unclear on how specialized/niche I would need to be, or if there's a market for "highly experienced generalists".