How to release to OSCaR Open Source

First of all, you may want to add a new origin that points to the open source repo, oscar-web-os.

Consider we have a new origin called public. And assume that we have a development branch which is checked out from the master branch in each repository, private and public (open source). So, the following are the steps to push our latest feature development and/or bug fixed:

1. Switch to development branch

git checkout development

2. Pull latest commit of development branch from public repository

git pull public development

3. Pull latest commit of master branch from public repository

git pull public master

4. Merge latest commit of master branch from origin to development branch

git merge master

5. Add changes and commit (make sure not to add any unrelated files or changes)

git add . 
git commit -m 'Your commit message'

6. Push development branch to private repository

git push origin development

7. Push development branch to public repository

git push public development

8. Send PR and Merge

Go to public repository and send pull request to merge development into master