ursus
05/17/2026, 9:46 AMzsmb
05/17/2026, 9:52 AMzsmb
05/17/2026, 9:53 AMursus
05/17/2026, 10:01 AMgit merge androix/main
and then CMP specifics are in the other module, which depends on core
smart, thanks!ursus
05/17/2026, 10:04 AMandroidx is huge - I'd be super curious how does a team do this? Git merge seems like a single person/computer job (I mean solving conflicts), right?
Or is there something smarter how to distribute the conflict resolution to the given package experts?