Repository: incubator-samoa
Updated Branches:
  refs/heads/master 9b178f631 -> e4489b0ac


Update CONTRIBUTING.md

Project: http://git-wip-us.apache.org/repos/asf/incubator-samoa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samoa/commit/e4489b0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samoa/tree/e4489b0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samoa/diff/e4489b0a

Branch: refs/heads/master
Commit: e4489b0aca4e7370460c7fea0fc51627178dabbd
Parents: 9b178f6
Author: Gyula Fora <[email protected]>
Authored: Sun Jun 28 19:40:18 2015 +0200
Committer: Gyula Fora <[email protected]>
Committed: Sun Jun 28 19:40:18 2015 +0200

----------------------------------------------------------------------
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/e4489b0a/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7ed0b44..dd232fd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,6 +59,7 @@ The recommended way is to submit a pull request **through 
GitHub**.
        1. If your contribution has no JIRA ticket, create a new JIRA ticket, 
describing the issue (see [^1] for how to do this).
        2. Otherwise note the existing JIRA ticket ID ( e.g. `SAMOA-XX` )
 1. Create a pull request from your contribution, and submit it through the 
github interface to the github SAMOA mirror repo. Make sure to **include the 
JIRA ticket ID in the description of the pull request**, so that the JIRA 
ticket is automatically updated. e.g.: `SAMOA-XX: Fixes XYZ`
+2. Make sure not to include any `merge` commits in your PR and always `rebase` 
on the current master to make it easier for project committers to apply your 
changes.
 
 The patch will be reviewed and voted upon, according to the [project's 
bylaws](http://samoa.incubator.apache.org/documentation/Bylaws.html).
 

Reply via email to