My company purchased a license to certain software. The license includes access to the product's github account so we can get real-time updates by fetching code directly from the repository.
Additionally, we also develop new functionality for this software in-house, and for that we have created a new git account (cloned from the original) that has our version of the code.
What's the best way to merge the code from the product's original repo to our code? Currently the two repositories are configured as different remote repositories.