whats the best practice for keeping up to date with master while working with custom entities in their own fork/version? Seems like it could be prone to merge conflicts?

Unfortunately it's a bit of a manual work for now. We're working on various front to make this less painful, e.g. code-gen as much as possible from the models directly. Hopefully it'll get better over the next few months.

Ok, no worries! Haven’t tried it myself, so it could be manageable

The most difficult part is the rest.li IDL & snapshot for GMS and UI. Models in general should have fewer conflicts.

To clarify @high-hospital-85984, do you mean your own, distinct entities, or customized versions of the entities that DataHub offers (like Datasets)?

Our own entities as well as new aspects to the existing ones, to begin with.

Yeah at this point we require that all models are in the same repo / module (so that MCE can reference them). To go a little deeper into what Mars said, we're moving towards an event model where we generate an event for every aspect, rather than have a monolithic event. These per-aspect events can be autogenerated.

That sounds awesome @microscopic-receptionist-23548 ! Ill keep an eye out for that!