Repository: incubator-apex-site Updated Branches: refs/heads/master 54aafc74b -> ceb677b5a
Improve pull request instructions. Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/ceb677b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/ceb677b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/ceb677b5 Branch: refs/heads/master Commit: ceb677b5a93807013cdeec2e28843ab75eeb6cea Parents: 54aafc7 Author: Thomas Weise <[email protected]> Authored: Thu Dec 31 15:08:54 2015 -0800 Committer: Thomas Weise <[email protected]> Committed: Thu Dec 31 15:08:54 2015 -0800 ---------------------------------------------------------------------- src/md/contributing.md | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/ceb677b5/src/md/contributing.md ---------------------------------------------------------------------- diff --git a/src/md/contributing.md b/src/md/contributing.md index cc090b3..d897c10 100644 --- a/src/md/contributing.md +++ b/src/md/contributing.md @@ -54,6 +54,10 @@ Creating a local branch that tracks a remote makes pull easier (no need to speci - Run `mvn license:format -Dlicense.skip=false` to automatically add the header when missing. 1. Once your feature is complete, submit the pull request on github against `devel-3`. 1. If you want specific people to review your pull request, use the `@` notation in Github comments to mention that user, and request that he/she reviews your changes. +1. Check the status of the pull request and ensure the Travis CI build is successful. If not, inspect the linked build log for details. + - If build fails due to license headers, follow instructions above. + - If build fails due to code style violations, run `mvn checkstyle:check -Dcheckstyle.console=true` and correct those issues that were introduced with your changes. +1. Add changes after the PR was opened to the same branch, Travis CI will detect changes and build automatically. To force the CI run, close and re-open the PR. 1. After all review is complete, combine all new commits into one squashed commit except when there are multiple contributors, and include the Jira number in the commit message. There are several ways to squash commits, but [here is one explanation from git-scm.com](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits) and a simple example is illustrated below: If tracking upstream/devel-3 then run `git rebase -i`. Else run `git rebase -i upstream/devel-3`.
