frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

doc: add steps for updating from upstream

Browse Source
This commit is contained in:
andrew.greene 2022-07-22 09:00:00 -06:00
parent 21ffd4ff4e
commit bf70acc0ac
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/code-contribution.md
View File

@ -17,3 +17,11 @@ Finally, deleting code often has unintended consequences - you should, at a mini
1. `npm run dev -- data/flows.json` or `npm start -- data/flows.json`
2. `npm run cy:run` # Runs cypress tests
## Updating from upstream
1. Add a reference to upstream `git remote add upstream https://github.com/node-red/node-red.git` (verify with `git remote -v`)
2. Fetch upstream `git fetch upstream`
3. `git checkout master`
4. `git merge upstream/master` # We've found rebasing to be quite difficult, preference is a single merge commit
5. Resolve merge conflicts
6. `git push origin master`