Console Output

+ git merge --ff appng-1.26.x --strategy-option theirs
Auto-merging pom.xml
Auto-merging appng-xmlapi/pom.xml
Auto-merging appng-upngizr/pom.xml
Auto-merging appng-upngizr/README.adoc
Auto-merging appng-tools/pom.xml
Auto-merging appng-testsupport/pom.xml
Auto-merging appng-template-parent/pom.xml
Auto-merging appng-template-assembly/pom.xml
Auto-merging appng-taglib/pom.xml
Removing appng-standalone/start_appng.sh
Removing appng-standalone/src/test/resources/xml/sourceConfig.xml
Removing appng-standalone/src/test/resources/txt/replacement.txt
Removing appng-standalone/src/test/java/org/appng/standalone/ApplicationStartupTest.java
Removing appng-standalone/src/main/resources/urlrewrite.xml
Removing appng-standalone/src/main/resources/script/appng.bat
Removing appng-standalone/src/main/resources/script/appng
Removing appng-standalone/src/main/resources/log4j.properties
Removing appng-standalone/src/main/resources/auto-install.list
Removing appng-standalone/src/main/resources/appNG.properties
Removing appng-standalone/src/main/java/org/appng/standalone/ApplicationStartup.java
Removing appng-standalone/src/main/assembly/assembly.xml
Removing appng-standalone/run.sh
Removing appng-standalone/readme.txt
CONFLICT (modify/delete): appng-standalone/pom.xml deleted in appng-1.26.x and modified in HEAD. Version HEAD of appng-standalone/pom.xml left in tree.
Removing appng-standalone/build.sh
Removing appng-standalone/appng.sh
Removing appng-standalone/appng.bat
Auto-merging appng-search/pom.xml
Auto-merging appng-rest-api/pom.xml
Auto-merging appng-persistence/pom.xml
Auto-merging appng-maven-plugin/pom.xml
Auto-merging appng-maven-plugin/README.adoc
Auto-merging appng-mail/pom.xml
Auto-merging appng-formtags/pom.xml
Auto-merging appng-forms/pom.xml
Auto-merging appng-documentation/pom.xml
Auto-merging appng-core/pom.xml
Auto-merging appng-cli/pom.xml
Auto-merging appng-camunda/pom.xml
Auto-merging appng-archetype-application/src/main/resources/archetype-resources/pom.xml
Auto-merging appng-archetype-application/pom.xml
Auto-merging appng-appngizer/pom.xml
Auto-merging appng-appngizer-maven-plugin/pom.xml
Auto-merging appng-appngizer-jaxb/pom.xml
Auto-merging appng-application/pom.xml
Auto-merging appng-application/README.adoc
Auto-merging appng-application-parent/pom.xml
Auto-merging appng-application-camunda/pom.xml
Auto-merging appng-application-camunda/README.adoc
Auto-merging appng-application-bom/pom.xml
Auto-merging appng-application-assembly/pom.xml
Auto-merging appng-api/pom.xml
Auto-merging README.adoc
Automatic merge failed; fix conflicts and then commit the result.