...
Resolve the conflicts if exist. Test with the merged code so that it does not break the system. Then, check
There are two checks executed as part of the build. First, Apache RAT verifies that Apache headers are in place where needed, by running RAT. You can run this check manually:
Code Block | ||
---|---|---|
| ||
$ mvn apache-rat:check |
Second, Checkstyle verifies that all Java code adheres to a coding standard. If this check fails, you should re-run Checkstyle manually:
Code Block | ||
---|---|---|
| ||
$ mvn checkstyle:checkstyle |
Then read Checkstyle results for the module which fails verification in .\target\site\checkstyle.html. Violations which caused the build break will show up as errors and need to be fixed; violations which show up as warnings or info can be ignored.
Finally, as a courtesy to the merger, you can rebase to master and squash all the commits from your PR into one:
...