@tammy just cleaning up my posts and consolidating a bit,
I think what you want technically is for the
master branch of your forked repository to track the
master branch of the main repository as closely as possible (I think this can be made automatic but you can also do it manually like I list above, I’m not a fork expert by I’ll ask @davidanthoff, there’s some docs here.
So what you want to do here is merge the master branch from MimiPAGE2020 master like I list above, most easily by getting onto your master branch, then calling
git merge https://github.com/openmodels/MimiPAGE2020.jl.git master
This will handle what is shown here:
Now, you want to merge your repositories master branch into whatever branch you’re working on, with the more familiar strategy of going to your branch, say
git checkout socioeconomics, and then merging in the master
git checkout socioeconomics
git merge master
The conflicts might be gross, VSCode should help you handle them and I’m also happy to help parse through those if you aren’t used to having to deal with those!
I’m also more than happy to do some of this for you or alongside you on Zoom