From 87d74c31d8c2ee09f05384993846ec1eccd56cec Mon Sep 17 00:00:00 2001 From: Travis Swicegood Date: Tue, 4 Dec 2018 07:49:32 -0600 Subject: [PATCH 1/2] Tweak the language around force pushes --- CONTRIBUTING.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 04451473..e62b2c47 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,9 +19,13 @@ Most of this is common sense, but please try to stick to the conventions listed Create a _Pull Request_ from your feature branch against Bash-it's _master_ branch. * Limit each Pull Request to one feature. Don't bundle multiple features/changes (e.g. a new _Theme_ and a fix to an existing plugin) into a single Pull Request - create one PR for the theme, and a separate PR for the fix. -* For complex changes, try to _squash_ your changes into a single commit. - Don't create a PR consisting of 20 commits that show your work in progress. - Before you create the PR, _squash_ your changes into a single commit. +* For complex changes, try to _squash_ your changes into a single commit before + pushing code. Once you've pushed your code and opened a PR, please refrain + from force-pushing changes to the PR branch – remember, bash-it is a + distributed project and your branch may be in use already. +* When in doubt, open a PR with too many commits. Bash-it is a learning project + for everyone involved. Showing your work provides a great history for folks + to learn what works and what didn't. ## Code Style From 3a7889e05b84dcb3686e57ff2f993de484990490 Mon Sep 17 00:00:00 2001 From: Nils Winkler Date: Wed, 5 Dec 2018 08:37:13 +0100 Subject: [PATCH 2/2] Update CONTRIBUTING.md Fixed capitalization of Bash-it. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e62b2c47..8c251c6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,7 @@ Most of this is common sense, but please try to stick to the conventions listed Don't bundle multiple features/changes (e.g. a new _Theme_ and a fix to an existing plugin) into a single Pull Request - create one PR for the theme, and a separate PR for the fix. * For complex changes, try to _squash_ your changes into a single commit before pushing code. Once you've pushed your code and opened a PR, please refrain - from force-pushing changes to the PR branch – remember, bash-it is a + from force-pushing changes to the PR branch – remember, Bash-it is a distributed project and your branch may be in use already. * When in doubt, open a PR with too many commits. Bash-it is a learning project for everyone involved. Showing your work provides a great history for folks