Skip to content

Conversation

AnotherButler
Copy link
Contributor

Compiler configuration section not included because of open PR #453

Compiler configuration section not included because of open PR ARMmbed#453
@screamerbg
Copy link
Contributor

@AnotherButler could you please confirm when you're ready with the changes/fixes?

Copy link
Contributor

@bridadan bridadan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking really good! One section just needs one little update to be technically correct, please see below.

README.md Outdated

```
$ git remote set-url --push origin https://github.com/screamerbg/repo-fork
```

Each time you `git` commit and push, or use `mbed publish`, the new revisions will be pushed against your fork. You can fetch from the original repository using `mbed update` or `git pull`. If you explicitly want to fetch or pull from your fork, then you can use `git pull https://github.com/screamerbg/repo-fork [branch]`.
Each of `git commit`, `git push` and `mbed publish` push the new revisions to your fork. You can fetch from the original repository using `mbed update` or `git pull`. If you explicitly want to fetch or pull from your fork, then you can use `git pull https://github.com/screamerbg/repo-fork [branch]`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't quite right. git commit and git push are the equivalent of mbed publish. So they can't be flattened to a list. The two git commands must remain paired.

So perhaps

Both git commit & git push and mbed publish push the new revisions...

The & is valid command syntax, I'm not using it as an English shortcut :)


To update your program to another upstream version, go to the root folder of the program and run:
To update your program to another upstream version, go to the root folder of the program, and run:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oxford comma? Or is this a corner case 😄 (I am actually curious though!)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha, no. When a coordinating conjunction joins two independent clauses, you must add a comma before the conjunction.

Make suggested edit about git commit and git push.
@AnotherButler
Copy link
Contributor Author

@screamerbg and @bridadan I think this is ready now. Please confirm.

Copy link
Contributor

@bridadan bridadan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@screamerbg
Copy link
Contributor

Thanks @AnotherButler

@screamerbg screamerbg merged commit 3c635a4 into ARMmbed:master Mar 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants