I forked and cloned both flarum/flarum and flarum/core (in vendor), to do some developing. But it looks like the master branch from flarum/flarum is not on the same page with the master branch from flarum/core.
I had to change flarum/flarum from master to newstruct and flarum/core to fix-extension-typehint to make the site work and not show me not found classes and incoherences.
Now, I am not sure if this the way to do it, so I would like to know what are the main active branches from core and flarum to use together in order to test and work on the next issues