Since this repository isn't a fork of the apollo repository, updating this repo with apollo's latest changes isn't a trivial task.
The original branch contains unchanged Apollo code. To update Apollo:
- Checkout the original branch.
git checkout original
- Download a ZIP file of the Apollo repository at the release you're interested in.
- Delete all the files in
src/BSc2018/apollo-2.0.0
- Extract the ZIP file into there.
- Commit the changes.
git commit -m "Updated Apollo to something"
- Checkout the master branch.
git checkout master
- Merge the original branch into the master branch to apply the apollo changes to our changes.
git merge original
- Resolve potential merge conflicts. There's many guides on this on the internet.
- Push the changes.
git push