You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
In doc/api/process.md, there is a typo in the 'A note on process I/O' section where it says:
Synchronous writes avoid problems such as output written with `console.log()` or `console.write()` being unexpectedly interleaved, ...
where console.write() should presumably instead be console.error(), since console.write() does not exist and console.error() is the only other console method referred to in that section.
git fetch --all # Make sure you have the latest changes
git checkout issue12565
git push # Make sure your remote branches are up to date
git reset --hard upstream/master # Assumes nodejs/node remote is called upstream
git cherry-pick origin/issue12565 # Assumes morrme/node remote is called origin
git push --force-with-lease
The cherry-pick will just pull the top commit from your remote branch, which is the only one you want.
After the cherry-pick you can do git log --graph --decorate --oneline, you should see something like this (your branch is master + the doc commit):
I found a similar fix but we've gotten so far with the CI jobs issue, I was worried about messing it up.
That's a very reasonable thing to worry about. The trick is to run git status before you make changes (make sure you're on the right branch), and to triple-check before your force push (git push -f).
Activity
[-]doc: typo in doc/api/process.md[/-][+]doc: typo in api/process.md[/+]morrme commentedon Apr 21, 2017
I can make this change.
morrme commentedon Apr 22, 2017
I have this ready but it's blocked by another PR :-(. Once that one clears I can send this one.
gibfahn commentedon Apr 23, 2017
@morrme what do you mean by blocked? You can have lots of PRs open at the same time.
I see that your
issue12565branch also has the commits from yourdoc-ci-jobsbranch. The fix is to do:The
cherry-pickwill just pull the top commit from your remote branch, which is the only one you want.Then you can raise another Pull Request with: master...morrme:issue12565
morrme commentedon Apr 23, 2017
@gibfahn that's what' I meant. I am so embarrassed to have made such a mistake!
I found a similar fix but we've gotten so far with the CI jobs issue, I was worried about messing it up.
I will give it a try.
Thanks for your support, as always!
gibfahn commentedon Apr 23, 2017
Git is hard, no need to be embarassed 😁 .
After the
cherry-pickyou can dogit log --graph --decorate --oneline, you should see something like this (your branch is master + the doc commit):That's a very reasonable thing to worry about. The trick is to run
git statusbefore you make changes (make sure you're on the right branch), and to triple-check before your force push (git push -f).morrme commentedon Apr 23, 2017
THANK YOU @gibfahn ! 🏆
doc: fix typo in doc/api/process.md
doc: fix typo in doc/api/process.md
doc: fix typo in doc/api/process.md
doc: fix typo in doc/api/process.md
doc: fix typo in doc/api/process.md
doc: fix typo in doc/api/process.md
doc: fix typo in doc/api/process.md