Quite timely post as I'm actively experimenting on this. As for my organization, we're trying out Databricks Repos. Tbd how that goes, as an IDE it's incredibly clunky but it gives our data scientists access to the larger codebase. You might also consider nbdime to manage notebook diffs.