-
-
Notifications
You must be signed in to change notification settings - Fork 102
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Renamed
master
branch to main
in CONTRIBUTING.md
- Loading branch information
Showing
1 changed file
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ | |
``` | ||
$ git remote add upstream [email protected]:rpearce/react-medium-image-zoom.git | ||
$ git fetch upstream | ||
$ git rebase upstream/master | ||
$ git rebase upstream/main | ||
``` | ||
1. Check out a feature branch | ||
``` | ||
|
@@ -19,12 +19,12 @@ | |
$ 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 checkout master | ||
$ git checkout main | ||
$ git fetch upstream | ||
$ git rebase upstream/master | ||
$ git rebase upstream/main | ||
``` | ||
1. Delete your feature branch (locally and then on GitHub) | ||
``` | ||
|