Skip to content

Change master to main in comments and contributing page #12

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

Merged
merged 1 commit into from
Mar 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ series [How to Contribute to an Open Source Project on GitHub][egghead]
2. Run `npm run setup -s` to install dependencies and run validation
3. Create a branch for your PR with `git checkout -b pr/your-branch-name`

> Tip: Keep your `master` branch pointing at the original repository and make
> Tip: Keep your `main` branch pointing at the original repository and make
> pull requests from branches on your fork. To do this, run:
>
> ```
> git remote add upstream https://github.com/kentcdodds/js-testing-fundamentals.git
> git fetch upstream
> git branch --set-upstream-to=upstream/master master
> git branch --set-upstream-to=upstream/main main
> ```
>
> This will add the original repository as a "remote" called "upstream," Then
> fetch the git information from that remote, then set your local `master`
> branch to use the upstream master branch whenever you run `git pull`. Then you
> can make all of your pull request branches based on this `master` branch.
> Whenever you want to update your version of `master`, do a regular `git pull`.
> fetch the git information from that remote, then set your local `main`
> branch to use the upstream main branch whenever you run `git pull`. Then you
> can make all of your pull request branches based on this `main` branch.
> Whenever you want to update your version of `main`, do a regular `git pull`.

## Help needed

Expand Down
2 changes: 1 addition & 1 deletion lessons/assertion-library.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ expected = 4
expect(result).toBe(expected)

/**
* Answer: Checkout the master branch for the answer.
* Answer: Checkout the main branch for the answer.
*/
2 changes: 1 addition & 1 deletion lessons/async-await.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ test('subtractAsync subtracts numbers asynchronously', () => {
})

/**
* Answer: Checkout the master branch for the answer.
* Answer: Checkout the main branch for the answer.
*/
2 changes: 1 addition & 1 deletion lessons/globals.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ test('subtractAsync subtracts numbers asynchronously', async () => {
/**
* Hint: https://nodejs.org/api/globals.html#globals_global
*
* Answer: Checkout the master branch for the answer.
* Answer: Checkout the main branch for the answer.
*/
2 changes: 1 addition & 1 deletion lessons/simple.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ let result, expected
/**
* Hint: there's no magic, just the most straightforward conditional statement.
*
* Answer: Checkout the master branch for the answer.
* Answer: Checkout the main branch for the answer.
*/
2 changes: 1 addition & 1 deletion lessons/testing-framework.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ test('subtract subtracts numbers', () => {
})

/**
* Answer: Checkout the master branch for the answer.
* Answer: Checkout the main branch for the answer.
*/