aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-04-25 14:32:05 +0200
committerBjörn Gustavsson <[email protected]>2017-04-26 07:14:44 +0200
commit29f04414ff8c1b36c85fbb6625be9ab2fce182f1 (patch)
tree061a1c5c8cae0123dd44837df3b105d3a506567e
parent8ca868848600702696828d729387343d73311a50 (diff)
downloadotp-29f04414ff8c1b36c85fbb6625be9ab2fce182f1.tar.gz
otp-29f04414ff8c1b36c85fbb6625be9ab2fce182f1.tar.bz2
otp-29f04414ff8c1b36c85fbb6625be9ab2fce182f1.zip
Add a piece of advice against naming branches 'maint' or 'master'
When a branch named 'maint' or 'master' is merged, the commit message for the merge will be confusing.
-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.