forked from unit-finance/unit-node-sdk
-
Notifications
You must be signed in to change notification settings - Fork 0
Home
Gautam Gupta edited this page Jul 25, 2024
·
5 revisions
Once you clone this repository, also add an upstream remote:
$ git remote add upstream git@github.com:unit-finance/unit-node-sdk.gitNote: Here origin is highbeamco/unit-node-sdk and upstream is unit-finance/unit-node-sdk based on setup above.
Since we want to keep our git history in sync with upstream as well as publish Highbeam's version of the changes to npm, here's the workflow right now:
- We maintain two branches:
mainandrelease - For review we make a pull request to
origin/mainand once approved, one toupstream/mainas well - Once merged to
origin/main, we rebasereleaseon top oforigin/main(git rebase origin/main) and drop any existing version bump commits (git rebase --skip). We then bump the version (should be higher than any prior highbeam's published versions), andnpm publish - To fetch upstream changes from time to time, we rebase
origin/mainonupstream/mainusinggit pull upstream main --rebaseandgit rebase --skipany commits that made it intoupstream/main
We will be rewriting histories of main and release this way but seems simplest for now. Open to suggestions.
Docs here.