File 0117-Add-a-piece-of-advice-against-naming-branches-maint-.patch of Package erlang
From 29f04414ff8c1b36c85fbb6625be9ab2fce182f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 25 Apr 2017 14:32:05 +0200
Subject: [PATCH] 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.
---
CONTRIBUTING.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 328b9f785..ca9674d10 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.
--
2.12.2