Console Output

+ git merge --ff hotfix/appng-1.24.1.1 --strategy-option theirs
Auto-merging pom.xml
Auto-merging appng-core/pom.xml
Auto-merging appng-application-bom/pom.xml
Merge made by the 'recursive' strategy.