@@ -52,7 +52,7 @@ Guidelines for bug reports:
52
52
reported.
53
53
54
54
2 . ** Check if the issue has been fixed** &mdash ; try to reproduce it using the
55
- ` master ` branch in the repository.
55
+ ` main ` branch in the repository.
56
56
57
57
3 . ** Isolate and report the problem** &mdash ; ideally, create a reduced test
58
58
case.
@@ -165,16 +165,16 @@ excellent pull request:
165
165
your fork:
166
166
167
167
``` bash
168
- git checkout master
169
- git pull upstream master
168
+ git checkout main
169
+ git pull upstream main
170
170
git push
171
171
```
172
172
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,
174
174
or fix.
175
175
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
178
178
changes in topic branches.
179
179
180
180
``` bash
@@ -203,17 +203,17 @@ excellent pull request:
203
203
with a clear title and description.
204
204
205
205
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.
207
207
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
210
210
necessary.
211
211
212
212
``` bash
213
- git checkout master
214
- git pull upstream master
213
+ git checkout main
214
+ git pull upstream main
215
215
git checkout < your-topic-branch>
216
- git rebase master
216
+ git rebase main
217
217
```
218
218
219
219
Thank you for your contributions!
@@ -244,4 +244,4 @@ For formatting the guides:
244
244
* We use backticks for module names, function names, and variable names.
245
245
246
246
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 ) .
0 commit comments