From bf70acc0acdfa46cf09e4ddbd7a7cfbc1e177800 Mon Sep 17 00:00:00 2001 From: "andrew.greene" Date: Fri, 22 Jul 2022 09:00:00 -0600 Subject: [PATCH] doc: add steps for updating from upstream --- docs/code-contribution.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/code-contribution.md b/docs/code-contribution.md index 689e86f67..7562dc934 100644 --- a/docs/code-contribution.md +++ b/docs/code-contribution.md @@ -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` \ No newline at end of file