Merge #770

770: Switch to main branch r=rmanoka a=nyurik After renaming default branch to `main`, please merge this PR. - [x] I agree to follow the project's [code of conduct](https://github.com/georust/geo/blob/master/CODE_OF_CONDUCT.md). - ~[ ] I added an entry to `CHANGES.md` if knowledge of this change could be valuable to users.~ --- Co-authored-by: Yuri Astrakhan <[email protected]>
georust · Mar 26, 2022 · 72cbba5 · 72cbba5
2 parents f53a160 + 258d337
commit 72cbba5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,4 +1,3 @@
-- [ ] I agree to follow the project's [code of conduct](https://github.com/georust/geo/blob/master/CODE_OF_CONDUCT.md).
+- [ ] I agree to follow the project's [code of conduct](https://github.com/georust/geo/blob/main/CODE_OF_CONDUCT.md).
 - [ ] I added an entry to `CHANGES.md` if knowledge of this change could be valuable to users.
 ---
-
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,7 +2,6 @@ on:
   push:
     branches:
       - main
-      - master
       - staging
       - trying
   pull_request:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,7 +13,7 @@ sections:
 
 As a reminder, all contributors are expected to follow our [Code of Conduct][coc].
 
-[coc]: https://github.com/georust/geo/blob/master/CODE_OF_CONDUCT.md
+[coc]: https://github.com/georust/geo/blob/main/CODE_OF_CONDUCT.md
 
 ## Feature Requests
 [feature-requests]: #feature-requests
@@ -94,7 +94,7 @@ those changes into the source repository.
 [about-pull-requests]: https://help.github.com/articles/about-pull-requests/
 [development-models]: https://help.github.com/articles/about-collaborative-development-models/
 
-Please make pull requests against the `master` branch.
+Please make pull requests against the `main` branch.
 
 All pull requests are reviewed by another person.
 
@@ -108,7 +108,7 @@ This tells @bors, our lovable integration bot, that your
 pull request has been approved. The PR then enters the merge
 queue, where @bors will run all the tests on every platform
 we support. If it all works out, @bors will merge your code
-into `master` and close the pull request.
+into `main` and close the pull request.
 
 ## Writing Tests and Documentation
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ on: @@
       push:
         branches:
           - main
-          - master
           - staging
           - trying
       pull_request:
@@ Expand Down @@