This is an automated email from the ASF dual-hosted git repository. aajisaka pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/yetus.git
The following commit(s) were added to refs/heads/master by this push: new c88ea1a YETUS-958. precommit-basic docs contains merge conflict marker (#102) c88ea1a is described below commit c88ea1a7d63b73def5c5797af348fabf4c68fe02 Author: Akira Ajisaka <aajis...@apache.org> AuthorDate: Tue Mar 31 02:16:08 2020 +0900 YETUS-958. precommit-basic docs contains merge conflict marker (#102) Signed-off-by: Nick Dimiduk <ndimi...@apache.org> --- asf-site-src/source/documentation/in-progress/precommit-basic.html.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/asf-site-src/source/documentation/in-progress/precommit-basic.html.md b/asf-site-src/source/documentation/in-progress/precommit-basic.html.md index e38bc6c..3b8bb1d 100644 --- a/asf-site-src/source/documentation/in-progress/precommit-basic.html.md +++ b/asf-site-src/source/documentation/in-progress/precommit-basic.html.md @@ -394,11 +394,7 @@ NOTE: JAVA\_HOME is always appended to the list of JDKs in MultiJDK mode. If JA `test-patch` also has a built-in mode (i.e., no plug-in required) to utilize Docker: ```diff -<<<<<<< HEAD -$ test-patch (other options) --docker -======= $ test-patch --docker ->>>>>>> YETUS-109. documentation: clarify --plugin ``` This command will do some preliminary setup and then re-execute itself inside a Docker container. For more information on how to provide a custom Dockerfile and other Docker-specific features, see the specific [precommit Docker support](../precommit-docker) page and the [Apache Yetus Docker Hub Images](/yetus-docker-image) page for more information on the convenience Docker images.