Skip to content

Update references to default branch to use "main" #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2021
Merged

Update references to default branch to use "main" #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
# also trigger the workflow manually from GitHub's UI.
pull_request: {}
push:
branches: [master]
branches: [main]
workflow_dispatch:

jobs:
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Expand Down