...
You now have two remotes: your fork called “origin” and the openedx core repo called “upstream”. Before beginning work on a change, you will want to get the latest code from upstream into your fork. Keep in mind that some repos use a “master” branch, others use “main”. If you are in a “main” repo, replace “master” with “main”:
Switch the current branch to master:
git switch master
.Pull down the changes from upstream and update your master:
git pull upstream master --ff-only
If everything has been done right, this will be a fast-forward merge, with no explicit merge commit. You shouldn’t have changes on your master, but if you do, the
git pull
command will fail with “fatal: Not possible to fast-forward, aborting.” If this happens, you will need to fix your master branch before continuing. (TODO: explain how to do this.)Push the changes to your fork to keep it up to date:
git push
.
...