Skip to content
This repository has been archived by the owner on Sep 1, 2022. It is now read-only.

Commit

Permalink
Merge pull request #62 from githubtraining/update-default-branch
Browse files Browse the repository at this point in the history
Rename master to main
  • Loading branch information
brianamarie authored Dec 2, 2020
2 parents 456307a + 0b290cd commit a8e3d3c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ For more information on the goals of this course, check out the [`course-details

## Contribute

See something we could improve? Check out the contributing guide in the [community contributors repository](https://github.com/githubtraining/community-contributors/blob/master/CONTRIBUTING.md) for more information on the types of contributions we :heart: and instructions.
See something we could improve? Check out the contributing guide in the [community contributors repository](https://github.com/githubtraining/community-contributors/blob/main/CONTRIBUTING.md) for more information on the types of contributions we :heart: and instructions.

We :heart: our community and take great care to ensure it is fun, safe and rewarding. Please review our [Code of Conduct](https://github.com/githubtraining/community-contributors/blob/master/CODE_OF_CONDUCT.md) for community expectations and guidelines for reporting concerns.
We :heart: our community and take great care to ensure it is fun, safe and rewarding. Please review our [Code of Conduct](https://github.com/githubtraining/community-contributors/blob/main/CODE_OF_CONDUCT.md) for community expectations and guidelines for reporting concerns.

## License

Expand Down
2 changes: 1 addition & 1 deletion responses/00_open-pr.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### :keyboard: Activity: Open a Pull Request

1. [Create a pull request to base `master` from `changes` branch]({{repoUrl}}/compare/master...changes)
1. [Create a pull request to base `main` from `changes` branch]({{repoUrl}}/compare/main...changes)
2. Title your pull request `Changes`

I'll respond with next steps in your pull request.
2 changes: 1 addition & 1 deletion responses/00_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This is where most of your code will go. You'll notice we have `App.jsx` along w

## Step 1: Set up the project locally

In this repository, we have two branches - `master` and `changes`. We will be working off of the `changes` branch. Let's go ahead and get started.
In this repository, we have two branches - `main` and `changes`. We will be working off of the `changes` branch. Let's go ahead and get started.

### :keyboard: Activity: Clone the repository and install Node

Expand Down
2 changes: 1 addition & 1 deletion responses/10_approve.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Now that we've approved the changes, it's time to merge the pull request.

### :keyboard: Activity: Merge the `changes` branch into `master`
### :keyboard: Activity: Merge the `changes` branch into `main`

1. Click the `Merge Pull Request` button

Expand Down
2 changes: 1 addition & 1 deletion responses/11_congrats.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Congratulations!

Congratulations on finishing Introduction to React. To update your local course, use `git checkout master` and `git pull`.
Congratulations on finishing Introduction to React. To update your local course, use `git checkout main` and `git pull`.

Although this course certainly doesn't mean you are a React expert, we hope you have the tools to explore further content on your own. Here are some cool resources for further learning:

Expand Down

0 comments on commit a8e3d3c

Please sign in to comment.