From c7668915ad493879820b4469d73a25864aeaeb23 Mon Sep 17 00:00:00 2001 From: Francois Daoust Date: Wed, 7 Apr 2021 11:32:49 +0200 Subject: [PATCH] Update references to default branch to use "main" See #274 --- .github/workflows/pr-push.yml | 2 +- CONTRIBUTING.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-push.yml b/.github/workflows/pr-push.yml index 180a896..18207d0 100644 --- a/.github/workflows/pr-push.yml +++ b/.github/workflows/pr-push.yml @@ -14,7 +14,7 @@ on: # also trigger the workflow manually from GitHub's UI. pull_request: {} push: - branches: [master] + branches: [main] workflow_dispatch: jobs: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d868230..9e094d7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,7 +51,7 @@ the spec. 1. Before doing any local changes, it is a good idea to ensure your fork is up-to-date with the upstream repository: ```bash git fetch upstream - git merge upstream/master + git merge upstream/main ``` 1. In the `openscreenprotocol` directory, update the spec source `index.bs` with your changes. 1. Review your changes and commit them locally: @@ -61,11 +61,11 @@ the spec. git commit -m "Your commit message" ``` [How to write a Git commit message](http://chris.beams.io/posts/git-commit/) -1. Push your changes up to your GitHub fork, assuming `YOUR_FORK_NAME` is the name of your remote, and you are working off of the default `gh-pages` branch: +1. Push your changes up to your GitHub fork, assuming `YOUR_FORK_NAME` is the name of your remote, and you are working off of the default `main` branch: ```bash - git push YOUR_FORK_NAME master + git push YOUR_FORK_NAME main ``` -Note: use the default `master` branch for minor changes only. For more significant +Note: use the default `main` branch for minor changes only. For more significant changes, please create a new branch instead. 1. On GitHub, navigate to your fork `https://github.com/YOUR_GITHUB_USERNAME/openscreenprotocol` and create a pull request with your changes.