From e072993c5596a6a1a0fef29108aa1e64d0399757 Mon Sep 17 00:00:00 2001 From: Sam Richard Date: Fri, 1 May 2015 07:58:00 -0400 Subject: [PATCH] :fire: Remove Branching Model section :memo: Lighten wording on Emoji usage --- CONTRIBUTING.md | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 076047d..9a448a3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,23 +23,15 @@ Gulp Sass is a very light-weight [Gulp](https://github.com/gulpjs/gulp) wrapper * Ensure that you have [EditorConfig](http://editorconfig.org/) installed in your editor of choice and that it is functioning properly. * Do not squash or rebase your commits when submitting a Pull Request. It makes it much harder to follow your work and make incremental changes. * Update the [CHANGELOG](#maintaining-thechangelog) with your changes. -* Ensure no Emoji tags are used in the title of your Pull Request +* Branches should be made off of the most current `master` branch from `git@github.com:dlmanning/gulp-sass.git` +* Pull requests should be made into our [master](https://github.com/dlmanning/gulp-sass/tree/master) branch. ### Git Commit Messages * Use the present tense (`"Add feature"` not `"Added Feature"`) * Use the imperative mood (`"Move cursor to…"` not `"Moves cursor to…"`) * Limit the first line to 72 characters or less -* Include relevant Emoji from our [Emoji cheatsheet](#emoji-cheatsheet) - -### Branching Model - -* Branches must be made off of the most current `master` branch from `git@github.com:dlmanning/gulp-sass.git` -* Pull requests must be made into our [master](https://github.com/dlmanning/gulp-sass/tree/master) branch. -* The following branch prefixes should be used when creating a new branch: - * `hotfix/` - fixes a bug that got through to a live version and need to be squashed - * `feature/` - update to or new code for `gulp-sass` - * `release/` - a release of `gulp-sass` +* Consider including relevant Emoji from our [Emoji cheatsheet](#emoji-cheatsheet) ## Creating a New Version