Skip to content

Commit 55971c9

Browse files
authored
Remove references to old master branch (#334)
1 parent c6c1e4b commit 55971c9

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/CONTRIBUTING.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Guidelines for bug reports:
5252
reported.
5353

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

5757
3. **Isolate and report the problem** — ideally, create a reduced test
5858
case.
@@ -165,16 +165,16 @@ excellent pull request:
165165
your fork:
166166

167167
```bash
168-
git checkout master
169-
git pull upstream master
168+
git checkout main
169+
git pull upstream main
170170
git push
171171
```
172172

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

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

180180
```bash
@@ -203,17 +203,17 @@ excellent pull request:
203203
with a clear title and description.
204204

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

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

212212
```bash
213-
git checkout master
214-
git pull upstream master
213+
git checkout main
214+
git pull upstream main
215215
git checkout <your-topic-branch>
216-
git rebase master
216+
git rebase main
217217
```
218218

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

246246
This contribution guide is adapted from the [Phoenix contribution
247-
guide](https://github.com/phoenixframework/phoenix/blob/master/CONTRIBUTING.md).
247+
guide](https://github.com/phoenixframework/phoenix/blob/main/CONTRIBUTING.md).

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
MAKE SURE TO READ THE CONTRIBUTING GUIDE BEFORE CREATING A PR
3-
https://github.com/boydm/scenic/blob/master/.github/CONTRIBUTING.md
3+
https://github.com/ScenicFramework/scenic/blob/main/.github/CONTRIBUTING.md
44
-->
55

66
<!-- Provide a general summary of your changes in the Title above -->

0 commit comments

Comments
 (0)