Skip to content
This repository has been archived by the owner on Jun 30, 2024. It is now read-only.

Commit

Permalink
switch from master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
rpearce committed Nov 7, 2020
1 parent ce686cc commit b607a86
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
```
$ git remote add upstream [email protected]:rpearce/react-expanding-textarea.git
$ git fetch upstream
$ git rebase upstream/master
$ git rebase upstream/main
```
1. Check out a feature branch
```
Expand All @@ -19,11 +19,11 @@
$ git push origin my-feature
```
1. Create a [pull request](https://help.github.com/articles/about-pull-requests/)
from your branch to this repo's `master` branch
1. When all is merged, pull down the upstream changes to your master
from your branch to this repo's `main` branch
1. When all is merged, pull down the upstream changes to your main
```
$ git fetch upstream
$ git merge upstream/master
$ git merge upstream/main
```
1. Delete your feature branch (locally and then on GitHub)
```
Expand Down

0 comments on commit b607a86

Please sign in to comment.