Skip to content

Commit 6a0244b

Browse files
committed
Be more strict about changes in master
1 parent f37e5c6 commit 6a0244b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

CONTRIBUTING.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,11 @@ in order to craft an excellent pull request:
128128
```
129129

130130
3. Create a new topic branch (off of `master`) to contain your feature, change,
131-
or fix:
131+
or fix.
132+
133+
**IMPORTANT**: Making changes in `master` is discouraged. You should always
134+
keep your local `master` in sync with upstream `master` and make your
135+
changes in topic branches.
132136

133137
```bash
134138
git checkout -b <topic-branch-name>
@@ -153,7 +157,7 @@ in order to craft an excellent pull request:
153157
rebasing on master and resolving any conflicts.
154158

155159
**IMPORTANT**: _Never ever_ merge upstream `master` into your branches. You
156-
should always `git rebase` on `master` to make your changes up to date when
160+
should always `git rebase` on `master` to bring your changes up to date when
157161
necessary.
158162

159163
```bash

0 commit comments

Comments
 (0)