Skip to content
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

Remove references to old master branch #334

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Remove references to old master branch #334

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
26 changes: 13 additions & 13 deletions .github/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Guidelines for bug reports:
reported.

2. **Check if the issue has been fixed** — try to reproduce it using the
`master` branch in the repository.
`main` branch in the repository.

3. **Isolate and report the problem** — ideally, create a reduced test
case.
Expand Down Expand Up @@ -165,16 +165,16 @@ excellent pull request:
your fork:

```bash
git checkout master
git pull upstream master
git checkout main
git pull upstream main
git push
```

3. Create a new topic branch (off of `master`) to contain your feature, change,
3. Create a new topic branch (off of `main`) to contain your feature, change,
or fix.

**IMPORTANT**: Making changes in `master` is discouraged. You should always
keep your local `master` in sync with upstream `master` and make your
**IMPORTANT**: Making changes in `main` is discouraged. You should always
keep your local `main` in sync with upstream `main` and make your
changes in topic branches.

```bash
Expand Down Expand Up @@ -203,17 +203,17 @@ excellent pull request:
with a clear title and description.

8. If you haven't updated your pull request for a while, you should consider
rebasing on master and resolving any conflicts.
rebasing on main and resolving any conflicts.

**IMPORTANT**: _Never ever_ merge upstream `master` into your branches. You
should always `git rebase` on `master` to bring your changes up to date when
**IMPORTANT**: _Never ever_ merge upstream `main` into your branches. You
should always `git rebase` on `main` to bring your changes up to date when
necessary.

```bash
git checkout master
git pull upstream master
git checkout main
git pull upstream main
git checkout <your-topic-branch>
git rebase master
git rebase main
```

Thank you for your contributions!
Expand Down Expand Up @@ -244,4 +244,4 @@ For formatting the guides:
* We use backticks for module names, function names, and variable names.

This contribution guide is adapted from the [Phoenix contribution
guide](https://github.com/phoenixframework/phoenix/blob/master/CONTRIBUTING.md).
guide](https://github.com/phoenixframework/phoenix/blob/main/CONTRIBUTING.md).
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
MAKE SURE TO READ THE CONTRIBUTING GUIDE BEFORE CREATING A PR
https://github.com/boydm/scenic/blob/master/.github/CONTRIBUTING.md
https://github.com/ScenicFramework/scenic/blob/main/.github/CONTRIBUTING.md
-->

<!-- Provide a general summary of your changes in the Title above -->
Expand Down
Loading