Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs : Improved REPL information regarding serial terminals screen and picocom #621

Merged
merged 18 commits into from
Jan 4, 2019

Conversation

rhubarbdog
Copy link
Contributor

The documentation to terminate serial terminal screen were incorrect
the documentation to terminate picocom didn't exist

@rhubarbdog rhubarbdog changed the title docs : Improved REPL information regarding serial terminals srreen ans picocom docs : Improved REPL information regarding serial terminals screen and picocom Dec 19, 2018
docs/devguide/repl.rst Outdated Show resolved Hide resolved
docs/devguide/repl.rst Outdated Show resolved Hide resolved
docs/devguide/repl.rst Outdated Show resolved Hide resolved
docs/devguide/repl.rst Outdated Show resolved Hide resolved
docs/devguide/repl.rst Outdated Show resolved Hide resolved
docs/devguide/repl.rst Outdated Show resolved Hide resolved
@microbit-carlos
Copy link
Collaborator

Thank you so much @rhubarbdog!
I've added a few comments, mostly to simplify a bit the content.
If you haven't used GH "suggested changes" feature before, there is some info here: https://help.github.com/articles/incorporating-feedback-in-your-pull-request/#applying-a-suggested-change

Could you also check that lines are only 79 characters long or fewer?
There is a few trailing whitespaces as well (a left over whitespace at the end of the line), it be great if you could remove those too.

Thank you again for the submission, is certainly appreciated!

microbit-carlos and others added 7 commits December 27, 2018 11:16
Co-Authored-By: rhubarbdog <33667064+rhubarbdog@users.noreply.github.com>
Co-Authored-By: rhubarbdog <33667064+rhubarbdog@users.noreply.github.com>
Co-Authored-By: rhubarbdog <33667064+rhubarbdog@users.noreply.github.com>
Co-Authored-By: rhubarbdog <33667064+rhubarbdog@users.noreply.github.com>
@rhubarbdog
Copy link
Contributor Author

Hi @microbit-carlos ,
you probably need to check this, i kinda screwed up accepting your suggestions. I accepted one of them which updated the mac section but had no equal suggestion for the linux section. i edited repl.rst by hand, this outdated some diffs and i've been freestyling since then. GitHub updated a diff but when i applied it things no longer made sence in the document.

@rhubarbdog
Copy link
Contributor Author

The above 3 commits are on README.md i didn't intend them to be included in this pull request. They are totally independent topics

docs/devguide/repl.rst Outdated Show resolved Hide resolved
docs/devguide/repl.rst Outdated Show resolved Hide resolved
docs/devguide/repl.rst Outdated Show resolved Hide resolved
@microbit-carlos
Copy link
Collaborator

Thanks for the update @rhubarbdog.
Yes, if you add more commits to the branch they will end up in the PR. You can revert the commit and submit in a new branch/PR for the REAME changes.

Co-Authored-By: rhubarbdog <33667064+rhubarbdog@users.noreply.github.com>
@rhubarbdog
Copy link
Contributor Author

@microbit-carlos the instructions to revert a pull request
https://help.github.com/articles/reverting-a-pull-request/ seem to be out of date.
I can't find any screen with a revert button.
can you refuse those commits? I can type them back in at a later date.

@microbit-carlos
Copy link
Collaborator

Hi @rhubarbdog ,

Right, I think those instructions are for reverting an already merged PR using the GH web interface. I was referring to do a 'git revert', this looks like a good article about this type of operation: https://www.atlassian.com/git/tutorials/undoing-changes/git-revert

@rhubarbdog
Copy link
Contributor Author

hi @microbit-carlos ,
That was a bit of a learning curve. I have never used the command git.
I've accepted / performed your suggested edits
and have reverted those edits to README.md

@microbit-carlos
Copy link
Collaborator

Thank you for your perseverance, it's really appreciated!
PR is ready, I'll merge it now :)

@microbit-carlos microbit-carlos merged commit 9f79a8e into bbcmicrobit:master Jan 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants