Git hasn’t solved it in a way that any normal person would want to deal with.