aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-04-26 12:38:22 +0200
committerGitHub <[email protected]>2017-04-26 12:38:22 +0200
commit9ded73921e8a6a5ecf00c27028fcff1bf1961992 (patch)
treef1a5540b5f2a6d5b54c56aff7c079ddd3db5d4d1
parent418a06c1fa14d144abb95d6e2030e49d074cf6e6 (diff)
parent29f04414ff8c1b36c85fbb6625be9ab2fce182f1 (diff)
downloadotp-9ded73921e8a6a5ecf00c27028fcff1bf1961992.tar.gz
otp-9ded73921e8a6a5ecf00c27028fcff1bf1961992.tar.bz2
otp-9ded73921e8a6a5ecf00c27028fcff1bf1961992.zip
Merge pull request #1427 from bjorng/bjorn/contributing
Add a piece of advice against naming branches 'maint' or 'master'
-rw-r--r--CONTRIBUTING.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 328b9f7859..ca9674d103 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,6 +9,9 @@ for more information.
You can contribute to Erlang/OTP by opening a Pull Request.
+Make sure you create a new branch for your pull request with `git checkout -b new-branch-name`.
+Never do your work directly on `maint` or `master`.
+
## Fixing a bug
* In most cases, pull requests for bug fixes should be based on the `maint` branch.