Merge pull request electron#11470 from electron/update-node-upgrade-doc

zcbenz · web-flow · commit 39ec40b90176 · 2017-12-20T10:08:09.000+09:00
Update branching steps in upgrading-node.md
diff --git a/docs/development/upgrading-node.md b/docs/development/upgrading-node.md
@@ -38,9 +38,10 @@ So in short, the primary steps are:
 
 ## Updating Electron's Node [fork](https://github.com/electron/node)
 
-1. Create a branch in https://github.com/electron/node: `electron-node-vX.X.X`
+1. Ensure that `master` on `electron/node` has updated release tags from `nodejs/node`
+2. Create a branch in https://github.com/electron/node: `electron-node-vX.X.X` where the base that you're branching from is the tag for the desired update
   - `vX.X.X` Must use a version of node compatible with our current version of chromium
-2. Re-apply our commits from the previous version of node we were using (`vY.Y.Y`) to `v.X.X.X`
+3. Re-apply our commits from the previous version of node we were using (`vY.Y.Y`) to `v.X.X.X`
   - Check release tag and select the range of commits we need to re-apply
   - Cherry-pick commit range:
     1. Checkout both `vY.Y.Y` & `v.X.X.X`
