Repository: incubator-unomi Updated Branches: refs/heads/master 989fc3670 -> 1d5725a12
Add a validation check on the procedure to merge pull requests. Signed-off-by: Serge Huber <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/1d5725a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/1d5725a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/1d5725a1 Branch: refs/heads/master Commit: 1d5725a121d4f0b09b09cbaee1121e5ff14f4b42 Parents: 989fc36 Author: Serge Huber <[email protected]> Authored: Fri Sep 7 09:08:23 2018 +0200 Committer: Serge Huber <[email protected]> Committed: Fri Sep 7 09:08:23 2018 +0200 ---------------------------------------------------------------------- MERGING-PULL-REQUESTS | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d5725a1/MERGING-PULL-REQUESTS ---------------------------------------------------------------------- diff --git a/MERGING-PULL-REQUESTS b/MERGING-PULL-REQUESTS index 9526cc5..f9b9afd 100644 --- a/MERGING-PULL-REQUESTS +++ b/MERGING-PULL-REQUESTS @@ -59,7 +59,11 @@ Step-by-step guide git checkout pr/<pull request number> -5. Merge the PR into the desired branch +5. Compile and check the code, at the minimum using: + + mvn clean install -P rat + +6. Merge the PR into the desired branch First checkout the desired branch and make sure it is up to date, for example: @@ -72,7 +76,7 @@ Step-by-step guide git merge -m "This closes pull request number #<pull request number>" pr/<pull request number> -6. Push the code +7. Push the code Push the code to Apache Git.
