Skip to content

Commit

Permalink
Add a piece of advice against naming branches 'maint' or 'master'
Browse files Browse the repository at this point in the history
When a branch named 'maint' or 'master' is merged, the commit
message for the merge will be confusing.
  • Loading branch information
bjorng committed Apr 26, 2017
1 parent 8ca8688 commit 29f0441
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Expand Up @@ -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.
Expand Down

0 comments on commit 29f0441

Please sign in to comment.