isaac-api

isaac-api is the server and API for the Isaac Computer Science projects. Together with isaac-react-app, it forms the core stack of the Isaac platform. This repository is a fork of the Isaac Physics repository.

The API runs on Jetty, and runs in Docker in production.

docs

Synchronizing changes with Isaac Physics repository

To synchronize this fork with changes from the Isaac Physics repository, this fork maintains a master branch for synchronizing with Isaac Computer Science. The process is as follows:

• Synchronize this repo's master branch with the physics master branch by clicking on Github's "Sync Fork" button.
• Create a new branch off of master for creating a pull request into main e.g. git checkout -b merge-master-2023-01-01. This branch can be deleted once the pull request merges and leave the master branch intact.
• Create a pull request from the above new branch to main, review the changes to ensure no conflicts, and merge the pull request.
• Here's an example of such a pull request.

To introduce changes in this repository back to the physics repository, branch your feature branch off of master and create a pull request back to the physics' master branch (this is the standard GitHub fork workflow.)