From a58df303bef1673cd7aa69c87b62d57e9e8bc990 Mon Sep 17 00:00:00 2001 From: dclim Date: Tue, 29 Sep 2015 12:22:35 -0600 Subject: [PATCH] Minor documentation fixes for CONTRIBUTING.md --- CONTRIBUTING.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4d1df8f369b..b2ff0aa8f1f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,12 +7,12 @@ When submitting a pull request (PR), please use the following guidelines: - Keep the number of commits small and combine commits for related changes. Each commit should compile on its own and ideally pass tests. - If you are introducing a new feature you may want to first submit your idea - of feedback in the [mailing list](mailto:druid-development@googlegroups.com). -- Bugfixes should include a unit-test or integration test reproducing the issue. -- Non-trivial features should include unit-test covering the new functionality. + for feedback to the [mailing list](mailto:druid-development@googlegroups.com). +- Bugfixes should include a unit test or integration test reproducing the issue. +- Non-trivial features should include unit tests covering the new functionality. - Make sure your code respects existing formatting conventions. We don't have a formal style guide yet, but use your own judgement. If you are using - IntelliJ, you can use import our code style settings jar + IntelliJ, you can import our code style settings jar: [intellij_formatting.jar](https://github.com/druid-io/druid/raw/master/intellij_formatting.jar). - Keep formatting changes in separate commits to make code reviews easier and distinguish them from actual code changes. @@ -114,9 +114,9 @@ When submitting a pull request (PR), please use the following guidelines: # FAQ -### Help! I merged changes from upstream and cannot figure out how to resolve conflits when rebasing! +### Help! I merged changes from upstream and cannot figure out how to resolve conflicts when rebasing! -Never fear, if you occasionally merged upgstream/master, here is another way to squash your changes into a single commit +Never fear! If you occasionally merged upstream/master, here is another way to squash your changes into a single commit: 1. First, rename your existing branch to something else, e.g. `feature-xxx-unclean` @@ -137,7 +137,7 @@ Never fear, if you occasionally merged upgstream/master, here is another way to git commit ``` -1. You can now submit this new branch and create or replace your existing pull request +1. You can now submit this new branch and create or replace your existing pull request. ``` git push origin [--force] feature-xxx:feature-xxx