From b607a86f2adb3ff50814a167c87c37f83a7ced81 Mon Sep 17 00:00:00 2001 From: Robert Pearce Date: Sat, 7 Nov 2020 17:49:03 -0500 Subject: [PATCH] switch from master to main --- CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9936afd..4bdb95f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ ``` $ git remote add upstream git@github.com:rpearce/react-expanding-textarea.git $ git fetch upstream - $ git rebase upstream/master + $ git rebase upstream/main ``` 1. Check out a feature branch ``` @@ -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) ```