diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 31dd399c5..86630ad49 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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/react-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 diff --git a/README.md b/README.md index e24847f1b..9245f336b 100644 --- a/README.md +++ b/README.md @@ -185,9 +185,9 @@ Thank you! https://kcd.im/rf-ws-feedback [build-badge]: https://img.shields.io/travis/kentcdodds/react-fundamentals.svg?style=flat-square&logo=travis [build]: https://travis-ci.org/kentcdodds/react-fundamentals [license-badge]: https://img.shields.io/badge/license-GPL%203.0%20License-blue.svg?style=flat-square -[license]: https://github.com/kentcdodds/react-fundamentals/blob/master/LICENSE +[license]: https://github.com/kentcdodds/react-fundamentals/blob/main/LICENSE [coc-badge]: https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square -[coc]: https://github.com/kentcdodds/react-fundamentals/blob/master/CODE_OF_CONDUCT.md +[coc]: https://github.com/kentcdodds/react-fundamentals/blob/main/CODE_OF_CONDUCT.md [emojis]: https://github.com/kentcdodds/all-contributors#emoji-key [all-contributors]: https://github.com/kentcdodds/all-contributors [win-path]: https://www.howtogeek.com/118594/how-to-edit-your-system-path-for-easy-command-line-access/ diff --git a/appveyor.yml b/appveyor.yml index 682000ce0..29c8f3460 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ environment: - node_version: 'stable' branches: only: - - master + - main install: - ps: Install-Product node $env:node_version test_script: