-
Check to see if you have an upstream remote set using
git remote -v
-
If you don't see the Microgen upstream add it
git remote add upstream git@github.com:MicrogenSite/microgen.git
-
Fetch the latest changes
git fetch upstream
-
Check out your local main branch
git checkout main
-
Merge the upstream branch into your local, be careful to maintain your content and customizations when resolving merge conflicts. Run
yarn install && yarn dev
after resolving conflicts to generate a new .tina-lock.json file based on the result of your merge.git merge upstream/main